Merge pull request #3230 from ryan-mccabe/collectd-5.9