Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9