settings.py
Merge branch 'master' into minor_fix