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