Merge pull request #3290 from mrunge/collectd-5.9