Hurr, some merge conflict was resolved poorly.  Fixed.
Hurr, some merge conflict was resolved poorly.  Fixed.

malthe/google-protobuf,malthe/google-protobuf,malthe/google-protobuf,malthe/google-protobuf,malthe/google-protobuf