move trace related info to interface header
Merge pull request #958 from ruil2/trace_update

    move trace related info to interface header
Merge remote-tracking branch 'upstream/master' into travis.osx