am 71558f1f: Merge "Fix times in debugging output to use H rather than k."

* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7':
  Fix times in debugging output to use H rather than k.