fix compile problems on x64 builds
Merge remote-tracking branch 'origin/bleeding-jumbo' into memdbg