Merge branch 'next' of https://github.com/rethinkdb/rethinkdb into next
Merge branch 'next' of https://github.com/JackieXie168/rethinkdb into next