[working copy]
Merge branch 'local-settings'