Remove extra whitespace at the ends of lines
Merge remote-tracking branch 'upstream/master' into forge