Removed trailing whitespace
merged branch pborreli/patch-9 (PR #7770)

This PR was merged into the 2.1 branch.

Discussion
----------

Removed trailing whitespace

Commits
-------

20d6fd8 Removed trailing whitespace