Add support for reading m2ua into TraceParcer
Merge remote-tracking branch 'origin/cap35'