Merge branch 'master' into translation
Merge branch 'master' into translation
Update translation files.
Merge branch 'translation'