Merge branch 'collectd-4.4'