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
add transform_<fieldname> methods to serializers, which basically do the opposite of validate_<fieldname> on a per-field basis.
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'
Update release-notes.md

Simple typo fix.
Merge pull request #1144 from jeffnuss/patch-1

Update release-notes.md
add tests for transform_fieldname methods
docs: add paragraph on transform_fieldname methods
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
support args on get_object_or_404
Merge pull request #1153 from hcliff/master

support args on get_object_or_404
Added @hcliff for #1153. Thanks!