Merge pull request #3264 from esdrubal/tzi_dst