Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework