Bug 845229 - added custom settings support
Merge pull request #8328 from yurenju/settings.py

Bug 845229 - added custom settings support