Incorporate changes into Protobuild upstream
Merge pull request #14 from hach-que/protobuild2

Incorporate changes into Protobuild upstream