Code

Merge branch 'collectd-4.2' into collectd-4.3