Add mixins to XModuleDescriptors as they are loaded during xml parsing
Merge pull request #985 from cpennington/mixins-for-xml-hotfix

Add mixins to XModuleDescriptors as they are loaded during xml parsing
Merge branch 'release'