Fix #3019.
Merge branch 'reql_admin' into tim_3019