Revert unnecessary whitespace changes
Merge remote-tracking branch 'origin/vm' into vm