* Backport doctype-tolerant fixes
regen for 218e69e