Merge pull request #7321 from nicolasnoble/upmerge

.gitmodules

.travis.yml

gRPC-Core.podspec

gRPC-ProtoRPC.podspec

gRPC-RxLibrary.podspec

include/grpc/module.modulemap

src/objective-c/BoringSSL.podspec

src/objective-c/GRPCClient/GRPCCall.m

src/objective-c/GRPCClient/private/GRPCWrappedCall.m

src/objective-c/ProtoRPC/ProtoRPC.m

src/objective-c/README.md

src/objective-c/examples/RemoteTestClient/RemoteTest.podspec

src/objective-c/examples/Sample/Podfile

src/objective-c/examples/SwiftSample/Podfile

src/objective-c/tests/Podfile

src/objective-c/tests/RemoteTestClient/RemoteTest.podspec

templates/gRPC-Core.podspec.template