Merge branch 'collectd-4.0'