Translated Over: disylee <disylee@hotmail.com>
Translated Over: disylee <disylee@hotmail.com>
Merge pull request #1926 from disylee/master

Translated-by: disylee <disylee@hotmail.com>