Update settings.py
Merge branch 'master' into stable_3