Merge branch 'origin/Translator'