Merge branch 'collectd-4.9'