Merge pull request #26 from pdxcat/ticket_12823_aptkey_defined_type