Merge branch 'release/v4.2.0'
Fixes to translations
Merge branch 'master' into develop to get newest translation fixes