Merged revision 981348 from trunk: Bug fix - proper RegExp matching to avoid having a case like "hhtml" being considered as "html".