fixed without
Merge branch 'v1.7.x' of github.com:rethinkdb/rethinkdb into v1.7.x