r2154: Merge of Jim's format string fixup in r2130:2131