am a213c695: am 372936d8: am c47b90a9: Merge "Add module \'idmap\'."

* commit 'a213c695a0e01fb0e34d3af4a09aa0c4f72c474a':
  Add module 'idmap'.