Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release

# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
This commit is contained in:
Jare Guo
2019-09-04 13:44:23 +08:00
Submodule native/tools/bindings-generator updated: 0765f4d13c...6b750dd800