Fix one more format string
- Merge master