Updates with django 1.5