Merge branch 'master' of https://github.com/katohidekazu/cakephp
Merge branch 'master' of https://github.com/katohidekazu/cakephp