Merge pull request #5384 from fderyckel/patch-3

minor edits