Bug 895340 - Fix error reporting of JS exceptions from C++ (r=bholley)
Bug 892225 - backout changeset b4426d926b31.