Merge pull request #764 from tokkee/sh/collectd-5.3