Merge branch 'collectd-4.6' into collectd-4.7