Merge pull request #1 from django/master

与原作者保持一致