more unordered_set
Fix recursive try_lock and ABMs
Merge remote-tracking branch 'upstream/master' into next