Merge with master
Remove trailing whitespaces.