Ticket 20429

Ticket https://code.djangoproject.com/ticket/20429