Fixed timezone path generation.
Merge remote-tracking branch 'origin/master'