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