conflict fixed
Merge branch 'master' of https://github.com/argeset/set-locale
Merge branch 'master' of https://github.com/argeset/set-locale