Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	.gitignore

diff --cc .gitignore
index a46d626,362e94f..e8f9af6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -58,7 -74,9 +58,10 @@@ bindings/perl/Collectd/pm_to_bli
  bindings/perl/blib/
  bindings/perl/pm_to_blib
  
 -# make dist stuff:
 -collectd-*.tar.gz
 -collectd-*.tar.bz2
 +# java stuff
 +bindings/java/java-build-stamp
 +bindings/java/org/collectd/api/*.class
 +bindings/java/org/collectd/java/*.class
+ 
+ # python stuff
+ *.pyc