Merge branch 'collectd-5.1'