Merge branch 'master' into cancel

.travis.yml

Makefile

build.json

examples/pubsub/main.cc

examples/pubsub/publisher.cc

examples/pubsub/publisher_test.cc

examples/pubsub/subscriber.cc

examples/pubsub/subscriber_test.cc

include/grpc++/config.h

include/grpc++/generic_stub.h

src/compiler/cpp_generator.cc

src/compiler/cpp_generator.h

src/compiler/cpp_plugin.cc

src/compiler/generator_helpers.h

src/compiler/python_generator.cc

src/compiler/ruby_generator.cc

src/compiler/ruby_generator.h

src/compiler/ruby_generator_helpers-inl.h

src/compiler/ruby_generator_map-inl.h

src/compiler/ruby_generator_string-inl.h