Merge branch 'wording-fixes' into 'master'