by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/dev-1.2.5' into dev-1.2.5

Conflicts:
	_test/core/htmlparser.js
	_test/core/node.js