Local configuration support.
Merge branch 'master' into issue-15-unstable
Merge branch 'issue-15-unstable'