Win64 ABI hotfix
Merge pull request #757 from kinke/abifix

Win64 ABI hotfix