Merge branch 'collectd-5.8' into collectd-master