Merge pull request #4788 from xmcclure/if-winrt