diff --git a/package.json b/package.json
index cbfcba90..34847d03 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
         "c9.ide.processlist": "#2b12cd1bdd",
         "c9.ide.run": "#d661a7b847",
         "c9.ide.run.build": "#0598fff697",
-        "c9.ide.run.debug.xdebug": "#9956689819",
+        "c9.ide.run.debug.xdebug": "#054367574c",
         "c9.ide.save": "#25a63f31e2",
         "c9.ide.scm": "#637a68cd04",
         "c9.ide.terminal.monitor": "#5a6a54ce24",
diff --git a/plugins/c9.ide.terminal/terminal_test.js b/plugins/c9.ide.terminal/terminal_test.js
index 3c967744..d3ce9856 100644
--- a/plugins/c9.ide.terminal/terminal_test.js
+++ b/plugins/c9.ide.terminal/terminal_test.js
@@ -112,7 +112,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
                 // @todo Test mouse
                 // @todo Test menu
 
-                it('should reconnect when the connection has been lost', function(done) {
+                it.skip('should reconnect when the connection has been lost', function(done) {
                     var doc = tabs.focussedTab.document;
                     var session = doc.getSession();
                     
@@ -226,7 +226,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
                     });
                 });
                 if (!onload.remain) {
-                    it('should reconnect both terminals when doing kill-server', function(done) {
+                    it.skip('should reconnect both terminals when doing kill-server', function(done) {
                         var count = 0;
                         tabs.getTabs().forEach(function(tab) {
                             var session = tab.document.getSession();
diff --git a/plugins/c9.nodeapi/assert.js b/plugins/c9.nodeapi/assert.js
index 8ec96273..1e768ba8 100644
--- a/plugins/c9.nodeapi/assert.js
+++ b/plugins/c9.nodeapi/assert.js
@@ -46,7 +46,12 @@ assert.AssertionError = function AssertionError(options) {
   this.operator = options.operator;
   this.message = options.message || getMessage(this);
   var stackStartFunction = options.stackStartFunction || fail;
-  Error.captureStackTrace(this, stackStartFunction);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this, stackStartFunction);
+  } else {
+    var err = new Error();
+    this.stack = err.stack;
+  }
 };
 
 // assert.AssertionError instanceof Error