diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index cbc41518..43b2c220 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -565,7 +565,7 @@ def run_models_in(environment):
 
 TEST_CODE = r"""
 def _TEST():
-    import doctest, sys, cStringIO, types, cgi, gluon.fileutils
+    import doctest, sys, cStringIO, types, gluon.fileutils
     if not gluon.fileutils.check_credentials(request):
         raise HTTP(401, web2py_error='invalid credentials')
     stdout = sys.stdout
diff --git a/gluon/languages.py b/gluon/languages.py
index 9ed60f9c..4ad2ac95 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -16,7 +16,6 @@ import re
 import sys
 import pkgutil
 import logging
-from cgi import escape
 from threading import RLock
 
 from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin
diff --git a/gluon/packages/dal b/gluon/packages/dal
index 67c9760f..e595b921 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 67c9760f71612dc376c5bded9b677b5f212b4968
+Subproject commit e595b921b02173bb804a061faa6d54773f18cd81