Pulled getParent() into abstract base class.
Merge remote-tracking branch 'origin/master' into space/14.1