Merge branch 'patch-43' into 'master'

Fix a typo in doc/development/documentation/styleguide.md

See merge request gitlab-org/gitlab-ce!25149

doc/development/documentation/styleguide.md

@@ -112,7 +112,7 @@ table_display_block: true
 ## Emphasis
 
 - Use double asterisks (`**`) to mark a word or text in bold (`**bold**`).
-- Use undescore (`_`) for text in italics (`_italic_`).
+- Use underscore (`_`) for text in italics (`_italic_`).
 - Use greater than (`>`) for blockquotes.
 
 ## Punctuation