Merge branch 'collectd-3.11' into merge/collectd-4