Merge pull request #3 from django/master