FBTrace: fix FBTrace command line (Orion)
Merge remote-tracking branch 'upstream/master'