generalizing conduits
Merge branch 'master' of https://github.com/polyf/corpstatesc
generalizing conduit placement