Merge "Fix 64-bit builds." into lmp-dev