fixed gmr backtraces (maybe)
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_inc_iii
Merge branch 'sam_inc_iii' into sam_inc_iv