Remove trailing whitespace
Merge pull request #1755 from gregkare/more_trailing_whitespace

Remove trailing whitespace