Code

Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10