First changes for django 1.5