Merging with master.

BUILD

Makefile

build.json

include/grpc++/async_unary_call.h

include/grpc++/stream.h

include/grpc/grpc.h

include/grpc/support/port_platform.h

src/compiler/cpp_generator.cc

src/compiler/csharp_generator.cc

src/compiler/csharp_generator.h

src/compiler/csharp_generator_helpers.h

src/compiler/csharp_plugin.cc

src/compiler/generator_helpers.h

src/core/iomgr/endpoint_pair_windows.c

src/core/iomgr/iocp_windows.c

src/core/iomgr/socket_utils_common_posix.c

src/core/iomgr/socket_utils_posix.h

src/core/iomgr/socket_windows.c

src/core/iomgr/socket_windows.h

src/core/iomgr/tcp_client_posix.c