Cleanup white space

 - Commit 722fba3 by @vehre split into two:
 - This white space cleanup commit
 - The following commit with substantive changes. Original message will
   be reproduced in subsequent commit

Author: vehre