Merge pull request #4954 from kissg1988/django