Fix issue #17657

https://code.djangoproject.com/ticket/17657

Conflicts:
	django/forms/models.py