Trim trailing whitespace
Merge pull request #2661 from xymbol/trim-whitespace

Trim trailing whitespace