Remove trailing whitespace
Merge pull request #2694 from fog/remove_trailing_whitespace

Remove trailing whitespace