diff --git a/VERSION b/VERSION
index c81af7c3..cd60b9c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.10.0-trunk+timestamp.2014.08.10.12.45.17
+Version 2.10.0-trunk+timestamp.2014.08.11.00.01.43
diff --git a/gluon/dal.py b/gluon/dal.py
index 51aab6ec..07eba094 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -10261,8 +10261,10 @@ class Field(Expression):
 
     def formatter(self, value):
         requires = self.requires
-        if value is None or not requires:
-            return value or self.map_none
+        if value is None:
+            return self.map_none
+        if not requires:
+            return value
         if not isinstance(requires, (list, tuple)):
             requires = [requires]
         elif isinstance(requires, tuple):
diff --git a/gluon/html.py b/gluon/html.py
index db880c47..8d480181 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -1863,6 +1863,7 @@ class INPUT(DIV):
             t = self['_type'] = 'text'
         t = t.lower()
         value = self['value']
+
         if self['_value'] is None or isinstance(self['_value'],cgi.FieldStorage):
             _value = None
         else:
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index c03930c1..78887499 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1140,12 +1140,12 @@ class SQLFORM(FORM):
                 default = field.default
                 if isinstance(default, CALLABLETYPES):
                     default = default()
-
             cond = readonly or \
                 (not ignore_rw and not field.writable and field.readable)
 
-            if default is not None and not cond:
+            if default is not None and not cond:                
                 default = field.formatter(default)
+
             dspval = default
             inpval = default
 
@@ -1599,7 +1599,6 @@ class SQLFORM(FORM):
                 fields[fieldname] = self.vars[fieldname]
 
         if dbio:
-            print fields
             for fieldname in fields:
                 if fieldname in self.extra_fields:
                     del fields[fieldname]
diff --git a/scripts/convert_templates.py b/scripts/convert_templates.py
deleted file mode 100644
index aa36a414..00000000
--- a/scripts/convert_templates.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import glob, os
-
-delimiters = ('<%','%>')
-
-filenames = glob.glob('views/*')+glob.glob('views/*/*')
-for filename in filenames:
-    if not os.path.isdir(filename):
-        page = open(filename,'rb').read()
-        page = page.replace('{{',delimiters[0]+' ').replace('}}',' '+delimiters[1])
-        open(filename,'wb').write(page)
-code = open('models/db.py','rb').read()
-code = code + '\n\n# custom delimiters for ractive.js or angular.js\nresponse.delimiters = %s\n' % repr(delimiters)
-open('models/db.py','wb').write(code)