diff --git a/VERSION b/VERSION
index af450676..4f14b643 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.8.2-stable+timestamp.2013.12.07.10.19.34
+Version 2.8.2-stable+timestamp.2013.12.07.18.35.39
diff --git a/applications/admin/controllers/shell.py b/applications/admin/controllers/shell.py
index 6d394861..3a835c7d 100644
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -3,6 +3,7 @@ import cStringIO
 import gluon.contrib.shell
 import code
 import thread
+import cgi
 from gluon.shell import env
 
 if DEMO_MODE or MULTI_USER_MODE:
@@ -40,7 +41,7 @@ def callback():
     k = len(session['commands:' + app]) - 1
     #output = PRE(output)
     #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
-    return 'In [%i] : %s%s\n' % (k + 1, command, output)
+    return cgi.escape('In [%i] : %s%s\n' % (k + 1, command, output))
 
 
 def reset():
diff --git a/applications/admin/views/shell/index.html b/applications/admin/views/shell/index.html
index cb510f91..c90da324 100644
--- a/applications/admin/views/shell/index.html
+++ b/applications/admin/views/shell/index.html
@@ -2,40 +2,41 @@
 {{block sectionclass}}shell{{end}}
 <!-- begin "shell" block -->
 <div id="wrapper">
-	<div class="row-fluid">
-		<div class="output-wrapper span8">
-			<textarea id="output" readonly="readonly">web2py Shell {{=request.env.web2py_version}}</textarea>
-		</div>
-	</div>
-
-	<div class="row-fluid">
-		<form id="form" action="{{=URL(r=request,f='callback',args=app)}}" method="get" class="span8">
-			<div id="shellwrapper">
-				<div class="prompt-wrapper">
-					<div class="prompt-container">
-						<textarea class="prompt" name="statement" id="statement"></textarea>
-					</div>
-					<a href="#" rel="tooltip" data-placement="right" data-original-title="{{=T('Type some Python code in here and hit Return (Enter) to execute it.')}}">
-						{{=helpicon()}}
-						<span>Type some Python code in here and hit Return (Enter) to execute it.</span>
-					</a>
-				</div>
-				<div id="caret"><span>&gt;&gt;&gt;</span></div>
-				<div id="autoscroll">autoscroll</div>
-			</div>
-		</form>
-	</div>
-
-	<div class="row-fluid clearfix">
-		<div class="help alert alert-info span6">
-		  <ul>
-			<li>Using the shell may lock the database to other users of this app.</li>
-			<li>Each db statement is automatically committed.</li>
-			<li>Creating new tables dynamically is not allowed.</li>
-			<li>Models are automatically imported in the shell.</li>
-		  </ul>
-		</div>
+  <div class="row-fluid">
+    <div class="output-wrapper span8">
+      <textarea id="output" readonly="readonly">web2py Shell {{=request.env.web2py_version}}
+</textarea>
+    </div>
+  </div>
+  
+  <div class="row-fluid">
+    <form id="form" action="{{=URL(r=request,f='callback',args=app)}}" method="get" class="span8">
+      <div id="shellwrapper">
+	<div class="prompt-wrapper">
+	  <div class="prompt-container">
+	    <textarea class="prompt" name="statement" id="statement"></textarea>
+	  </div>
+	  <a href="#" rel="tooltip" data-placement="right" data-original-title="{{=T('Type some Python code in here and hit Return (Enter) to execute it.')}}">
+	    {{=helpicon()}}
+	    <span>Type some Python code in here and hit Return (Enter) to execute it.</span>
+	  </a>
 	</div>
+	<div id="caret"><span>&gt;&gt;&gt;</span></div>
+	<div id="autoscroll">autoscroll</div>
+      </div>
+    </form>
+  </div>
+  
+  <div class="row-fluid clearfix">
+    <div class="help alert alert-info span6">
+      <ul>
+	<li>Using the shell may lock the database to other users of this app.</li>
+	<li>Each db statement is automatically committed.</li>
+	<li>Creating new tables dynamically is not allowed.</li>
+	<li>Models are automatically imported in the shell.</li>
+      </ul>
+    </div>
+  </div>
 </div>
 <script type="text/javascript" src="{{=URL('static', 'js/autoscroll.js')}}"></script>
 
@@ -113,4 +114,4 @@ jQuery(document).ready(function(){
   });
 });
 </script>
-<!-- end "shell" block -->
\ No newline at end of file
+<!-- end "shell" block -->