fixed between
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor