Merge branch 'master' into 'master'

Fix typos and grammar errors

See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html

See merge request !7451