Fix XML generation bugs in enumeration model
Merge branch 'master' into gh-pages