stable sorting
Merge branch 'mlucy_2155' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next