Ticket 21447

Refs ticket 21447: https://code.djangoproject.com/ticket/21447