kurahen styles
Merge branch 'master' into test-kurahen (styles)