Merge branch 'release/2.1' into develop
Fix new languages.
Merge branch 'release/2.1r2'