updated to the latest version on the windows client
Merge remote-tracking branch 'origin/master'