modernized windows check
Merge pull request #6357 from iquaba/develop

modernized windows check