Deboxify topic-map
Merge pull request #2436 from ArmedGuy/master

Deboxify topic-map