Merge "Drop support for XHTML 1.0"