fixed some warnings on windows
Merge branch 'master' into 3rdPartyUpdate