Merge branch 'master' of https://github.com/grpc/grpc into to-grpc-err-is-human

BUILD

CMakeLists.txt

Makefile

Rakefile

binding.gyp

build.yaml

doc/PROTOCOL-WEB.md

doc/internationalization.md

etc/roots.pem

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-Core.podspec

grpc.def

grpc.gemspec

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

include/grpc/impl/codegen/grpc_types.h

include/grpc/impl/codegen/port_platform.h