t4_djsettings: done
Merge branch 't4_djsettings'