Merge branch 'ff/collection' into collectd-4.0