Issue 6660 (Don't group command line commands)
http://code.google.com/p/fbug/issues/detail?id=6660
Merge remote-tracking branch 'origin/master' into jsd2