Translated by disylee 2014/5/21
Merge pull request #1013 from disylee/master

Translated by disylee 2014/5/21