cherry-pick
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_665