More informative xml parsing errors
Merge branch 'master' into 93Br