Merge "Fix format-string warning"