Adding missing files from previous commit
Putting mergeMixin back in to MiscUtils