Fixes #995. OTS by @atnnn
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into grey_issue_266