Whitespace cleanup
Merge branch 'master' into automatic_defaults