merge changes from upstream settings.py