Merge change 556 into donut

* changes:
  Fixed a bug in XML parser handler where some words were being split in two. Fixes #1812655.