Pulled getParent() into abstract base class.
Merge branch 'master' into features/TS