Merge branch 'collectd-5.6'