Merge pull request #2201 from rolfbjarne/linker-better-xml-processing-errors