Upgrading to protoc 2.5