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