Merge branch 'master' into merge/collectd-4