Merge branch 'master' of git://git.verplant.org/collectd