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