Merge pull request #7872 from Wedmer/zoneinfo_2018i