Fix the build (some XML files were badly formatted)
Merge branch 'fix-build' into eesc