Merge pull request #1816 from octo/grpc-free-iter