Rename WindowsDX to Windows
Merge branch 'master' into develop