translated
Merge pull request #1309 from vito-L/master

translated