Merge pull request #5981 from mikeller/fix_capitals_in_settings