Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd