Merge branch 'master' of https://github.com/cakephp/localized
Merge branch 'master' of https://github.com/cakephp-fr/localized