Merge branch 'win32' into win32-3