django/django — pull request #3014 by kateseamer (2014-08-04 07:49:47+00:00)
Title: Refactor of fix for Ticket 22232

This is a refactor of NathanRSmith's fix for ticket #22232