Merged 0003-Fixed-format-specifiers.patch by Matt Kern.