Merge branch 'collectd-4.8' into collectd-4.9