[pull] master from encode:master#20

pull[bot] merged 2 commits intojoshuadavidthomas:masterjoshuadavidthomas/django-rest-framework:masterfrom

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