Merge pull request #14689 from peter-stadler/django