Merge pull request #2794 from xmcclure/win-aot-basic