Mass-remove trailing whitespace.
Cleanup DOS-style newlines.
Merge remote-tracking branch 'upstream/master'