Merge pull request #22917 from commodo/django1