TIDOC-949 Added extends field and corrected subtype field.
TIDOC-949 Removed debug print statement.
Merge pull request #4013 from arthurevans/tidoc-949

TIDOC-949 Added extends field and corrected subtype field.