Merge "64-bit build fix."