COMP: Update protobuf to master