Test and fix which closes #652.
Version 2.3.3
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework