Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1