Merge pull request #3297 from lateralusX/jlorenss/win-x64-fix-pinvoke-failures