django/django — pull request #1010 by bmispelon (2013-04-12 21:32:47+00:00)
Title: Ticket 4117

Based on my branch for ticket #19874 which has been marked ready for checkin.