capitalized “organization” and “settings”
Merge remote-tracking branch 'origin/master'