Merge branch 'pull/collectd-4.0'