Auto-Merge pull request #2957 from niuxu18/collectd-5.8