fixes #1287
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Restored < operator to `counted_t`.