Minor simplification on the regex.

Conflicts:
	core/htmldataprocessor.js