Merge branch 'sh/collectd-5.1' into collectd-5.1