Merge commit 'c2bac086a7c5e638100a8cea959acd527a7496ce' into v3
Merge branch 'v3' of https://github.com/Z-starts/cocos2d-x into v3