Merge branch 'collectd-4.7' into collectd-4.8