2014-6-5 Translated  Signed-off-by: disylee <disylee@hotmail.com>
Merge pull request #1126 from disylee/master

2014-6-5 Translated  Signed-off-by: disylee <disylee@hotmail.com>