am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."

* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
  Fix 'r' for LP64.