Merge branch 'time_zone' into 'master'

Time zone

See merge request !251