Merge "Mutex: Note that STL is generally prefered" into nyc-dev