am 399b09b8: Merge "Fix 64bit issues in logging code."

* commit '399b09b8ef9d53769d5084ba1cf0d3e964bb0a1a':
  Fix 64bit issues in logging code.