add import from settings_local
Merge remote-tracking branch 'upstream/master'