Fix coding style
Merge branch 'master' into ruby-2.x