Merge pull request #2958 from Montellese/settings_description_confluence