Merge pull request #1289 from Arantor/release-2.1

! XML formats do actually need XML tags.