Merge remote-tracking branch 'upstream/develop' into develop

application/libraries/Timezones.php

@@ -317,7 +317,6 @@ class Timezones
             'Europe/Bucharest' => 'Bucharest (+2:00)',
             'Europe/Chisinau' => 'Chisinau (+2:00)',
             'Europe/Helsinki' => 'Helsinki (+2:00)',
-            'Europe/Istanbul' => 'Istanbul (+3:00)',
             'Europe/Kaliningrad' => 'Kaliningrad (+2:00)',
             'Europe/Kiev' => 'Kiev (+2:00)',
             'Europe/Mariehamn' => 'Mariehamn (+2:00)',
@@ -331,6 +330,7 @@ class Timezones
             'Europe/Uzhgorod' => 'Uzhgorod (+2:00)',
             'Europe/Vilnius' => 'Vilnius (+2:00)',
             'Europe/Zaporozhye' => 'Zaporozhye (+2:00)',
+            'Europe/Istanbul' => 'Istanbul (+3:00)',
             'Europe/Moscow' => 'Moscow (+3:00)',
             'Europe/Volgograd' => 'Volgograd (+3:00)',
             'Europe/Samara' => 'Samara (+4:00)',
@@ -343,13 +343,13 @@ class Timezones
             'Asia/Beirut' => 'Beirut (+2:00)',
             'Asia/Damascus' => 'Damascus (+2:00)',
             'Asia/Gaza' => 'Gaza (+2:00)',
-            'Asia/Istanbul' => 'Istanbul (+3:00)',
             'Asia/Jerusalem' => 'Jerusalem (+2:00)',
             'Asia/Nicosia' => 'Nicosia (+2:00)',
             'Asia/Tel_Aviv' => 'Tel_Aviv (+2:00)',
             'Asia/Aden' => 'Aden (+3:00)',
             'Asia/Baghdad' => 'Baghdad (+3:00)',
             'Asia/Bahrain' => 'Bahrain (+3:00)',
+            'Asia/Istanbul' => 'Istanbul (+3:00)',
             'Asia/Kuwait' => 'Kuwait (+3:00)',
             'Asia/Qatar' => 'Qatar (+3:00)',
             'Asia/Tehran' => 'Tehran (+3:30)',