add some traces
Merge pull request #1545 from ruil2/add_traces

add some traces
Merge remote-tracking branch 'upstream/master' into travis.osx