Updating for windows
Merge branch 'master' into us5975