Merge pull request #17047 from betesh/master

Time includes DateAndTime::Zones acts_like(:time)