Merge pull request #2227 from esdrubal/tzparse