Output formatting bugs in mtrace.cpp
Merge branch 'master' into mtrace
tmp