closed #1317
closed #1316
fix translations
small fix
Merge branch 'master' into dev
#1300 tmp