diff --git a/package.json b/package.json
index d646f90d..6047cb54 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#00dd412ebd",
+        "c9.ide.language": "#3c703d6784",
         "c9.ide.language.css": "#a649f2a710",
         "c9.ide.language.generic": "#77d43cfaf0",
         "c9.ide.language.html": "#0f4078c187",
diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js
index 705331ce..4491b1e8 100644
--- a/plugins/c9.ide.dialog.common/question.js
+++ b/plugins/c9.ide.dialog.common/question.js
@@ -37,8 +37,8 @@ define(function(require, module, exports) {
                 var metadata = options.metadata;
                 
                 plugin.title = title;
-                plugin.heading = util.escapeXml(header);
-                plugin.body = util.escapeXml(msg).replace(/\n/g, "<br />");
+                plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
+                plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
                 
                 plugin.allowClose = cancel;
                 
diff --git a/plugins/c9.ide.terminal/predict_echo.js b/plugins/c9.ide.terminal/predict_echo.js
index 92697099..f634a093 100644
--- a/plugins/c9.ide.terminal/predict_echo.js
+++ b/plugins/c9.ide.terminal/predict_echo.js
@@ -493,8 +493,8 @@ define(function(require, exports, module) {
                     predictStartY = session.terminal.y + session.terminal.ybase;
                     state = STATE_PREDICT;
                     if (!checkTextBeforePrediction()) {
-                        errorHandler.reportError(new Error("Warning: unable to init predictions"));
-                        if (DEBUG) debugger;
+                        // Appears to happen when tmux or shell unexpectedly sends a new line
+                        console.warn("Unable to init predictions");
                         state = STATE_WAIT_FOR_ECHO;
                     }
                 });