Merge branch 'master' into develop
Merge branch 'develop' of github.com:klen/starter-python-django into develop