Strip trailing whitespace
Merge pull request #2241 from ussuri/small-fixes-2

Strip trailing whitespace