Clariy squash comes after review.

So people don't focus on writing good commit messages for a bunch of unrelated fixes.
Merge pull request #7257 from cirosantilli/patch-4

Clariy squash comes after review.