Merge remote-tracking branch 'origin/collectd-5.8'