Fix to compute_changes (touches could sometimes override data changes)
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next