* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e': Adjust format strings to work on both 32-bit and 64-bit builds