Remove trailing spaces.
Merge branch 'trailing-spaces'

Merge pull request #842 into master.

Closes #842