Bug 1115847 - Commit correct version of patch from bug 1100337. (r=me)
Bug 1114587 - Bail out in-place for debug mode in exception handler even if there's no pending exception, so that the DebugEpilogue is called. (r=nbp)