Fix issue #3372.
Merge branch 'reql_admin' of github.com:rethinkdb/rethinkdb into reql_admin