[OSX] Remove support for Windows
Merge branch 'dev-osx' into dev