Merge branch 'collectd-3.11'