Merge branch 'collectd-4.8'