Fixed trailing whitespace
merged branch pborreli/patch-6 (PR #7228)

This PR was merged into the 2.2 branch.

Commits
-------

c6c71bf Fixed trailing whitespace

Discussion
----------

Fixed trailing whitespace