Fixed |scope| list to contain superclasses
auto-merge staging into master