am 99188064: am 340aa8cb: Merge "New command line tool \'idmap\'"

* commit '99188064fd3b2d4ca85b02afefa4adb2562f8940':
  New command line tool 'idmap'