Merge branch 'collectd-4.10'