Update for RethinkDB 1.15
Merge for 1.15