Merge change 1346 into donut

* changes:
  Better output for viewing the method trace.