All changes commited prior to cocos2dx upgrade