Simplified platform detection for Windows
Merge pull request #3177 from rpherbig/master
Update history to reflect merge of #3177 [ci skip]