Merge branch 'collectd-4.5'

Conflicts:

	configure.in

diff --cc README
Simple merge

diff --cc configure.in
index ffaacc3,c71cfa4..d416e69
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -3004,4 -2918,6 +3011,8 @@@ Configuration
  
  EOF
  
+ if test "x$dependency_error" = "xyes"; then
+       AC_MSG_ERROR("Some plugins are missing dependencies - see above summary for details")
+ fi
++
 +# vim: set fdm=marker :