[zh-cn] synced recent updates from en#989
Merged
kazupon merged 5 commits intovuejs:masterfrom Sep 25, 2017
Jinjiang:zh-cn
Merged
[zh-cn] synced recent updates from en#989kazupon merged 5 commits intovuejs:masterfrom Jinjiang:zh-cn
kazupon merged 5 commits intovuejs:masterfrom
Jinjiang:zh-cn