am 6f6d494b: Merge "Improve the dump code."

* commit '6f6d494bb49461692b7629b024fe49fbee58b765':
  Improve the dump code.