Updated Win32 build
Merged Win32 changes