Merge r1770677 from trunk: * r1770677 Make the XML parser stricter by prohibiting custom XML entities. Justification: The parser should properly error out on invalid data. Votes: +1: kotkov, rhuijben, stefan2