Merge pull request #6499 from systemcrash/grammar_fixes