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