Tidy up trailing whitespace
Merge remote-tracking branch 'upstream/master'