Cleanup of Settings class
Merge branch 'upstream/master'