Merge branch 'pull/collectd-3.11' into collectd-3.11