Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd