Merge branch 'collectd-4.5'