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