Merge pull request #3085 from lateralusX/jlorenss/win-x64-pinvoke-empty-struct