Fix dist build#6139

rpkilby merged 2 commits intoencode:masterencode/django-rest-framework:masterfrom

rpkilby:fix-testingrpkilby/django-rest-framework:fix-testingCopy head branch name to clipboard