Incorporate changes into Protobuild upstream

Updates this branch with the new upstream version of Protobuild