Thanks to Marek Kubica for the report and initial patch, and to oinopion and
erikr for work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17064 bcc190cf-cafb-0310-a4f2-bffc1f526a37