fixed XML test: dependent on Scala library used?
Merge remote-tracking branch 'origin/master'