i18n
i18n
some patches
Merge origin/master
some patches