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