Merge remote-tracking branch 'origin/master' into 2.4.0

Conflicts:
	rest_framework/fields.py

2 files changed, 6 insertions, 1 deletions

diff --git a/tests/models.py b/tests/models.py
index e171d3bd..fba3f8f7 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -105,6 +105,7 @@ class Album(RESTFrameworkModel):
     title = models.CharField(max_length=100, unique=True)
     ref = models.CharField(max_length=10, unique=True, null=True, blank=True)
 
+
 class Photo(RESTFrameworkModel):
     description = models.TextField()
     album = models.ForeignKey(Album)
@@ -112,7 +113,8 @@ class Photo(RESTFrameworkModel):
 
 # Model for issue #324
 class BlankFieldModel(RESTFrameworkModel):
-    title = models.CharField(max_length=100, blank=True, null=False)
+    title = models.CharField(max_length=100, blank=True, null=False,
+                             default="title")
 
 
 # Model for issue #380
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index 98936ae8..6a1a3521 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -1237,6 +1237,9 @@ class BlankFieldTests(TestCase):
     def test_create_model_null_field(self):
         serializer = self.model_serializer_class(data={'title': None})
         self.assertEqual(serializer.is_valid(), True)
+        serializer.save()
+        self.assertIsNot(serializer.object.pk, None)
+        self.assertEqual(serializer.object.title, '')
 
     def test_create_not_blank_field(self):
         """