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

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