Upgrade to protobuf v2.6.1