Fix win32 build
Merge branch 'win32fix' into win32color
Should be enabled