repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
closed #4584, Add feature to force update the environment variables in setup.py.
Merge branch 'develop' into issue4584
[AUTO]: updating luabinding automatically
Merge pull request #6120 from CocosRobot/update_lua_bindings_1396435283

[AUTO]: updating luabinding automatically
fix PhysicsShapeEdgeChain::init() always return false
fix resume not support in midi file in win32
Merge pull request #6124 from koowolf/mid_resume

fix resume not support in midi file in win32
[ci skip]
fixed set blend func
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Synchronize LabelTest of cpp to lua to fix some bug and add more tests
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
[Jenkins][ci skip]: Monitor jenkins queue build
[Jenkins][ci skip]: Fix call method
Merge pull request #6128 from lmskater/monitor-queue-build

[Jenkins][ci skip]: Monitor jenkins queue build
Merge pull request #6129 from samuele3hu/develop_new_label

Synchronize LabelTest of cpp to lua to fix some bug and add more tests
closed #4557: Adds `EventListener::setEnabled/isEnabled`.