am 1ff91085: am 52e7d3d9: Bulletproof leak dump against null hash entries

Merge commit '1ff910858c8ae5863761101c673a196a6a16bca3'

* commit '1ff910858c8ae5863761101c673a196a6a16bca3':
  Bulletproof leak dump against null hash entries