Merge pull request #1846 from tokkee/collectd-5.4