Merge remote-tracking branch 'github/pr/1009'

diff --cc AUTHORS
Simple merge

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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