Merge branch 'master' into epoll_changes_merged

BUILD

Makefile

binding.gyp

build.yaml

config.m4

doc/cpp-style-guide.md

examples/python/route_guide/route_guide_server.py

gRPC.podspec

grpc.def

grpc.gemspec

include/grpc++/ext/proto_server_reflection_plugin.h

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

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

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

include/grpc++/impl/server_builder_option.h

include/grpc++/server_builder.h

include/grpc/support/avl.h

package.xml

setup.py

src/compiler/cpp_generator.cc