Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8