Merge branch 'collectd-4.3' into collectd-4.4