Better separation of settings.
Merge remote-tracking branch 'upstream/master'