Merge pull request #7097 from tru7/libfmt