Merge branch 'collectd-3.11' into collectd-4.0