Export Rethinkdb Errors -- Related to #1926
Merge branch 'next' into sam_alt