When running headless, fall back to a simple string comparison for checking Windowsiness.
Merge branch '1.12'
Merge branch 'master' into pull-requests