am 026867c7: Merge "Improve stack overflow diagnostics."

* commit '026867c7dcce7828212dcd4a61806146908e9039':
  Improve stack overflow diagnostics.