Make compatible with Django > 1.4