Merge branch 'master' into 1.7.x
Merge branch '1.7.x' of github.com:meowfreeze/django_startproject into 1.7.x