Merge pull request #1321 from esdrubal/currentsystemtimezone