Merge pull request #2874 from lateralusX/jlorenss/win-x64-support