Update windows branch from master
trying to fix platform branches
Update windows branch from master
Test update
Testing update strategy
Merge branch 'master' into windows