Merge branch 'c3+r' of github.com:ctiller/grpc into c3+r