Merge pull request #2018 from Diapolo/fix_warning
ensure we use our format macros to avoid compilation warnings