Merge "Use Xml::element instead of Html::element for empty elements"