remove extraneous typedef
Merge branch 'master' into trace