Added better debugging for dtrace.
Merge branch 'test' into dev