haberman Merge pull request protocolbuffers#379 from fowles/master