Backport fix for 'zero milliseconds' doctest failure.
Prep 3.7.1 release.