Merge pull request #1 from django/master

合并更新