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