Issue #4589: Fix bugs
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #221 from pandamicro/master

Issue #4589: Fix bugs