Updated for django 1.6 support