Merge branch 'collectd-5.7'