Revert accidental stupidity
Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0