Fix #351
Merge branch 'master' of github.com:DataDog/dd-agent