Merge branch 'master' into John
a few style changes

a few style changes
Merge branch 'John'