Merge branch 'master' into ff/subsecond

diff --cc src/collectd.h
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/plugin.c
Simple merge

diff --cc src/plugin.h
Simple merge

diff --cc src/rrdtool.c
Simple merge