Merge branch 'pull/collectd-4'