Merge branch 'master' into collectd-4