Merge branch 'collectd-4.5' into collectd-4.6