[fixed] by xuheng
Merge remote-tracking branch 'origin/master'

Conflicts:
	_test/ui/tooltip.js