Merge branch 'v2' of https://github.com/cocos2d/cocos2d-x into v2_luacompile