Work on bug #5989.  Some changes in the label that get printed on the image.