Chrono: merge fixes for #9274, #9276.

[SVN r86448]