Merge branch 'collectd-5.5'

No match.