merge origin master changes to w32 porting