Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py

Fixed conflicts