Merge branch 'win32'