Merge django-rest-framework branch