Merge arguments branch to bleeding merge.

src/factory.cc

Index: src/factory.cc
diff --git a/src/factory.cc b/src/factory.cc
index 2c100a4940e69124aace22c35c8636d9c88a4400..ebe57c08aedcae3297e16dbdcf7f06a9490f4899 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -250,11 +250,10 @@ Handle<Context> Factory::NewFunctionContext(int length,
 
 
 Handle<Context> Factory::NewCatchContext(Handle<Context> previous,
-                                         Handle<String> name,
-                                         Handle<Object> thrown_object) {
+                                         Handle<JSObject> extension) {
   CALL_HEAP_FUNCTION(
       isolate(),
-      isolate()->heap()->AllocateCatchContext(*previous, *name, *thrown_object),
+      isolate()->heap()->AllocateCatchContext(*previous, *extension),
       Context);
 }