Merge "Work around a Time design flaw." into jb-mr2-dev