Merge pull request #2409 from phkelley/win32_thread_fixes Win32: Fix object::cache::threadmania test on x64