am 578087e3: Merge "New command line tool \'idmap\'"

* commit '578087e39845a0c9a728ba18963f498d1f69b279':
  New command line tool 'idmap'