Merge branch 'dev' into master
Get timezone from settings.ini
Merge branch 'master' into dev