Merge pull request #1835 from hnyman/collectd-fix-parallel