Merge "More efficient stack walk in exception throwing."