Merge remote-tracking branch 'origin/develop' into develop-vuminhkh

Conflicts:
	alien4cloud-ui/yo/Gruntfile.js