more whitespace -remove trailing spaces
whitespace cleanup
more whitespace cleanup
whitespace - strip trailing spaces:
Merge pull request #4466 from eileenmcnaughton/master

Master