Use proposed coding style
Merge branch 'master' into dead_code