[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins] watchdog
[Jenkins] watchdog
[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop