Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

1 files changed, 5 insertions, 0 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f3e17b18..5be2a21b 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -185,8 +185,13 @@ class Field(object):
         self.allow_null = allow_null
 
         if allow_null and self.default_empty_html is empty:
+            # HTML input cannot represent `None` values, so we need to
+            # forcibly coerce empty HTML values to `None` if `allow_null=True`.
             self.default_empty_html = None
 
+        if default is not empty:
+            self.default_empty_html = default
+
         if validators is not None:
             self.validators = validators[:]