Merge pull request #1 from collectd/master