Merge win32 branch