Merge branch 'build_system_improvements'
Merge branch 'new_timezone_settings'