Actually merged changes to settings.py