CAPX-107: Moved orphan handling to importer.
Merge fix
Merge pull request #43 from Trellon/CAPX-107

CAPX-107: Moved orphan handling to importer.