Merge branch 'master' into migrate_to_transifix
Improve i18n translation
Merge branch 'migrate_to_transifix'