am 7e296254: Merge "Fix broken XML parsing idiom."

* commit '7e29625463e6034147c24992d0ad319ddf426088':
  Fix broken XML parsing idiom.