Merge "Added -q flag to showmap." into nyc-dev
am: 792a10b

* commit '792a10b940deeb1d0649f29a2f5777ac668ef780':
  Added -q flag to showmap.