Merge pull request #1365 from sebras/fix-warning-formatting