Sync Cocos2d-JS master