django/django — pull request #1151 by KevinBrolly (2013-05-19 10:45:41+00:00)
Title: Fixes Ticket #16330

This PR fixes ticket #16330 and incorporates all changes requested in the comments.