Merge branch 'master' into dont-deserialize-twice

2 files changed, 6 insertions, 2 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index d407865f..d202c86e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include rest_framework/static *.js *.css *.png
+recursive-include rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff
 recursive-include rest_framework/templates *.html
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index b00f9b7a..833a4e48 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -230,7 +230,11 @@ class Serializer(BaseSerializer):
 
     def get_initial(self):
         if self._initial_data is not None:
-            return self.to_representation(self._initial_data)
+            return ReturnDict([
+                (field_name, field.get_value(self._initial_data))
+                for field_name, field in self.fields.items()
+                if field.get_value(self._initial_data) is not empty
+            ], serializer=self)
 
         return ReturnDict([
             (field.field_name, field.get_initial())