more bugfixes for xml+meta auto-repair
Merge branch 'master' into gh-pages