Merge pull request #699 from ctiller/mac3

Fix in tree build of protobuf