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