Commit fix for instance activation/deactivation with inheritance
Merge branch 'master' of https://github.com/RobertBColton/enigma-dev