Merge branch 'master' into 0.21
diff --git a/README.md b/README.md
index 6c894ec..223a79d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 Superset
-=========
+========== 
 
 [![Build Status](https://travis-ci.org/apache/incubator-superset.svg?branch=master)](https://travis-ci.org/apache/incubator-superset)
 [![PyPI version](https://badge.fury.io/py/superset.svg)](https://badge.fury.io/py/superset)
diff --git a/superset/assets/package.json b/superset/assets/package.json
index ae64eef..7396f0b 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superset",
-  "version": "0.21.0dev",
+  "version": "0.21.0",
   "description": "Superset is a data exploration platform designed to be visual, intuitive, and interactive.",
   "license": "Apache-2.0",
   "directories": {
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index e095228..48577b9 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -472,7 +472,7 @@
                         # For backwards compatibility and edge cases
                         # where a column data type might have changed
                         if isinstance(v, basestring):
-                            v = v.strip("'").strip('"')
+                            v = v.strip(""").strip(""")
                             if col_obj.is_num:
                                 v = utils.string_to_num(v)