Convert to django 1.5