Merge remote-tracking branch 'github/pr/1336' into collectd-5.5