Merge branch 'collectd-4.6'