Merge branch 'pull/collectd-4.0' into collectd-4.0