Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.