Merge branch 'collectd-5.0' into collectd-5.1