Change settings.py
...
...
Merge branch 'master' into dev