Thanks Kit Sunde for the report and Brian Holdefehr for the initial patch. Backport of 6ed6a18a0 from master.
6ed6a18a0
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13784 bcc190cf-cafb-0310-a4f2-bffc1f526a37