add trace tag
modify the logic for WME usage
modify trace output
Merge pull request #1183 from ruil2/trace_tag

    add trace tag
Merge pull request #1186 from huili2/diff_logic_WME_master

modify the logic for WME usage
Merge remote-tracking branch 'upstream/master' into travis.osx