Merge "Fix 'r' for LP64."