Merge branch 'ff/entropy' into collectd-4