Merge "Fix showmap SIGSEGV." am: 8a72d54a4f
am: 29a53cf9c8

* commit '29a53cf9c8b1f1267b5a0cd14ad5461163f14d56':
  Fix showmap SIGSEGV.