Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...