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