Backport of e2e4cdba11 from master
e2e4cdba11
* Removed trailing whitespace. * Added newline to EOF if missing. * Removed blank lines at EOF. * Removed some stray tabs.