Merge pull request #2 from collectd/master