Merge branch 'flow-like-lava-to-a-barnyard' of github.com:ctiller/grpc into flow-like-lava-to-a-barnyard