Code

Merge remote branch 'origin/collectd-4.8' into collectd-4.8