Whitespace snips.
Merge branch 'whitespace'