Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	.gitignore

diff --cc .gitignore
index a46d6261905d4abc3bb46972900848bf83ce63c8,362e94fdb985ae49309ead07869be6058ced91be..e8f9af66d7879336910ff56dd76f8b70d796dd23
--- 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