ADOrientation emulation on windows
Merge branches