Further fixes to handle port multiplicities and missing type information (bad models)
Authored by: philsp 2015-02-27
Parent: [r3889]
Child: [r3891]
