merge win32 and linux
merge win32 and linux
Merge remote-tracking branch 'origin/master'