Merge branch 'collectd-3.10'