Merge change 24474 into eclair

* changes:
  Fix an infinite loop in time2sub.