diff --git a/VERSION b/VERSION
index 450a45d7..6d0f183c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.11.13.00.56
+Version 2.6.0-development+timestamp.2013.07.12.09.51.41
diff --git a/gluon/highlight.py b/gluon/highlight.py
index 28e3e0de..4687ac98 100644
--- a/gluon/highlight.py
+++ b/gluon/highlight.py
@@ -333,7 +333,7 @@ def highlight(
                   == '_' and value])
     if fa:
         fa = ' ' + fa
-    return '<table%s><tr valign="top"><td style="width:40px; text-align: right;"><pre style="%s">%s</pre></td><td><pre style="%s">%s</pre></td></tr></table>'\
+    return '<table%s><tr style="vertical-align:top;"><td style="width:40px; text-align: right;"><pre style="%s">%s</pre></td><td><pre style="%s">%s</pre></td></tr></table>'\
         % (fa, linenumbers_style, numbers, code_style, code)
 
 
diff --git a/gluon/html.py b/gluon/html.py
index 8714bc73..61a5bee8 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -2302,7 +2302,7 @@ class BEAUTIFY(DIV):
     example::
 
         >>> BEAUTIFY(['a', 'b', {'hello': 'world'}]).xml()
-        '<div><table><tr><td><div>a</div></td></tr><tr><td><div>b</div></td></tr><tr><td><div><table><tr><td style="font-weight:bold;vertical-align:top">hello</td><td valign="top">:</td><td><div>world</div></td></tr></table></div></td></tr></table></div>'
+        '<div><table><tr><td><div>a</div></td></tr><tr><td><div>b</div></td></tr><tr><td><div><table><tr><td style="font-weight:bold;vertical-align:top;">hello</td><td style="vertical-align:top;">:</td><td><div>world</div></td></tr></table></div></td></tr></table></div>'
 
     turns any list, dictionary, etc into decent looking html.
     Two special attributes are
@@ -2354,8 +2354,8 @@ class BEAUTIFY(DIV):
                             continue
                         rows.append(
                             TR(
-                                TD(filtered_key, _style='font-weight:bold;vertical-align:top'),
-                                TD(':', _valign='top'),
+                                TD(filtered_key, _style='font-weight:bold;vertical-align:top;'),
+                                TD(':', _style='vertical-align:top;'),
                                 TD(BEAUTIFY(value, **attributes))))
                     components.append(TABLE(*rows, **attributes))
                     continue
diff --git a/gluon/validators.py b/gluon/validators.py
index 97a4e490..898e197b 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -2665,8 +2665,8 @@ class IS_EMPTY_OR(Validator):
         if hasattr(other, 'options'):
             self.options = self._options
 
-    def _options(self, zero=False):
-        options = self.other.options(zero=zero)
+    def _options(self):
+        options = self.other.options()
         if (not options or options[0][0] != '') and not self.multiple:
             options.insert(0, ('', ''))
         return options