Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown

src/csharp/Grpc.Auth/GoogleCredential.cs

src/csharp/Grpc.Auth/Grpc.Auth.csproj

src/csharp/Grpc.Auth/OAuth2Interceptors.cs

src/csharp/Grpc.Auth/app.config

src/csharp/Grpc.Auth/packages.config

src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs

src/csharp/Grpc.Core.Tests/ChannelTest.cs

src/csharp/Grpc.Core.Tests/ClientServerTest.cs

src/csharp/Grpc.Core.Tests/CompressionTest.cs

src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs

src/csharp/Grpc.Core.Tests/MockServiceHelper.cs

src/csharp/Grpc.Core.Tests/ResponseHeadersTest.cs

src/csharp/Grpc.Core/CallInvocationDetails.cs

src/csharp/Grpc.Core/CallOptions.cs

src/csharp/Grpc.Core/Calls.cs

src/csharp/Grpc.Core/Channel.cs

src/csharp/Grpc.Core/ChannelOptions.cs

src/csharp/Grpc.Core/ClientBase.cs

src/csharp/Grpc.Core/ContextPropagationToken.cs

src/csharp/Grpc.Core/Grpc.Core.csproj