Replace std::unordered_map and std::unordered_set with the above. Better performance profile.
Merge commit '7b0c47d3f0c20eeeceb0324771eb86ab80b0bd86' as 'externals/mp'