Remove possible deadlock in win32 resolver
Merge branch 'master' into 1.12