Merge "Fix times in debugging output to use H rather than k."