Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6