Incorporate upstream changes
This also requires re-"compiling" the protobuf code which appeared to be broken in our previous master
branch
This also requires re-"compiling" the protobuf code which appeared to be broken in our previous master
branch