issue #3229, review
Merge branch 'master' of github.com:gloryming/cocos-docs