Merge pull request #2378 from cramertj/grpc-meta