* Fixed compatibility with cocos2d-x v 3.1.1
Merge branch 'master' into release-cocos2dx-3