Small tweak to XML validation code
Merge remote-tracking branch 'upstream3/master'