Use PRIi64 macro to work around clang weirdness.
Merge branch 'next' into sam_2134