Updates to keep pace with changes made in standard default settings.py in 1.5