fixes #4527
Merge pull request #37 from chengstory/#4527

fixes #4527
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x