Backported to Django-1.6.8