Whitespace fixes.
Merge remote-tracking branch 'lakin/master'