Merge pull request #2649 from solgenomics/topic/fix_time_roots