Tweaks to get port mod errors working properly
Merge branch 'xcpd' into richard_working
Fixes to problems with output in flow mapper
Merge branch 'richard_working' of github.com:richardclegg/xcpd into richard_working