am cbf07a25: am 2be511d4: Merge "Improve stack overflow diagnostics (take 2)."

* commit 'cbf07a25149cd924a348e4dc0395c5d08f86fd7f':
  Improve stack overflow diagnostics (take 2).