Merge branch 'master' into testing
Language fixes
Merge branch 'testing'