Merge pull request #5561 from ucasFL/master

Translated
This commit is contained in:
Flynn 2017-05-15 00:24:15 +08:00 committed by GitHub
commit 35917b16ad