- Use underscore_style
Merge branch 'master' into only-compile-newer
- Fix typo