Merge branch 'sh/collectd-4.5' into sh/collectd-4.6