[pull] master from encode:master#25

pull[bot] merged 1 commit intojoshuadavidthomas:masterjoshuadavidthomas/django-rest-framework:masterfrom

encode:masterencode/django-rest-framework:masterCopy head branch name to clipboard