Auto-Merge pull request #2514 from octo/collectd-5.8