Updated to django 1.6