merging ericbottard-XD-767-768-Mail
merged ericbottard-XD-782-CompositeModRegistry