Add documentation about local settings variables.
Merge branch 'dev'
Merge branch 'dev'