Merge branch 'custom-serializer-form-class' of https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390

Conflicts:
	rest_framework/fields.py
	rest_framework/renderers.py
Manually solved