Merge branch 'master' into 3.0-beta

1 files changed, 4 insertions, 0 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index bb43708d..778bc718 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -181,6 +181,9 @@ class Field(object):
         self.style = {} if style is None else style
         self.allow_null = allow_null
 
+        if allow_null and self.default_empty_html is empty:
+            self.default_empty_html = None
+
         if validators is not None:
             self.validators = validators[:]
 
@@ -495,6 +498,7 @@ class CharField(Field):
     }
     initial = ''
     coerce_blank_to_null = False
+    default_empty_html = ''
 
     def __init__(self, **kwargs):
         self.allow_blank = kwargs.pop('allow_blank', False)