Merge branch 'master' into xtra_header

.pylintrc

CMakeLists.txt

Makefile

Rakefile

WORKSPACE

binding.gyp

build.yaml

doc/service_config.md

examples/ruby/grpc-demo.gemspec

examples/ruby/without_protobuf/README.md

examples/ruby/without_protobuf/echo_client.rb

examples/ruby/without_protobuf/echo_server.rb

examples/ruby/without_protobuf/echo_services_noprotobuf.rb

grpc.gemspec

include/grpc++/impl/codegen/server_context.h

include/grpc/impl/codegen/port_platform.h

setup.py

src/core/ext/census/grpc_filter.c

src/core/ext/client_channel/client_channel.c

src/core/ext/client_channel/resolver.c