Fix layout of Windows yaml
Merge branch 'master' into passable_branch