Thanks Vinay Sajip for the support of his django3 branch and Jannis Leidel for the review.
Thanks to ejucovy for the suggestion and patch! git-svn-id: http://code.djangoproject.com/svn/django/trunk@16045 bcc190cf-cafb-0310-a4f2-bffc1f526a37