Attempted 64-bit compile fix.
Merge master.