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