Merge "Command line display now includes name of program"