cocos2d/cocos2d-html5 — pull request #2375 by VisualSJ (2014-10-20 07:52:45+00:00)
Title: Issue #5983: merge -x code

merge -x #8851
merge -x #8804