Merge pull request #17414 from totten/master-settime