Fix for settings.py to let project build
Merge remote-tracking branch 'origin/master'