Merge pull request #1 from tomchristie/master

Update from main
Merge pull request #2 from tomchristie/master

Update to latest
Merge pull request #3 from tomchristie/master

Update to latest
Merge remote-tracking branch 'upstream/master'
Fix error when serializer gets files but no data
Add missing newline at the end of test file
Try a more localised fix to the data=None problem
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #1104 from FreakyDug/master

Fix a TypeError when a serializer is created with files but no data
Drop erronous left-over bit of docs.  Closes #1147
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework