- Added TypeObject class as a base class for type objects
Merge remote-tracking branch 'upstream/master'