updated proto file
Merge branch '1305_update_proto_file' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next