Merge branch 'fix-glinkedptrmutex' into fix-msvc64
Merge remote-tracking branch 'origin/pr/797' into fix-msvc64