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