"Code stylin : PHPCS 1.4.6"
Merge branch 'master/chiba' into rel/chiba2