Merge branch 'collectd-4.2'

diff --cc bindings/Makefile.am
index 1c604e1,c724725..620389f
--- 1/bindings/Makefile.am
--- 2/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@@ -4,16 -3,15 +4,16 @@@ EXTRA_DIST = perl/Collectd.pm perl/Make
  all-local: @PERL_BINDINGS@
  
  install-exec-local:
-       [ ! -f perl/Makefile ] || $(MAKE) -C perl install
+       [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
  
  clean-local:
-       [ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
+       [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
  
  perl: perl/Makefile
-       $(MAKE) -C perl
+       cd perl && $(MAKE)
  
 -perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
 +perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
 +      perl/Collectd/Makefile.PL $(top_builddir)/config.status
        cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
  
  .perl-directory-stamp:

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/configfile.c
Simple merge