Merge pull request #2 from django/master

合并更新