Trim trailing spaces.
Merged with master.