Fixed for Django-1.7