Merge branch '2.6RC'2.6

2 files changed, 107 insertions, 83 deletions

diff --git a/vendor/sabre/vobject/lib/timezonedata/lotuszones.php b/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
index 7d0785f04..79d555a92 100644
--- a/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
+++ b/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
@@ -17,85 +17,85 @@ return [
     'Mexico Standard Time 2' => 'America/Chihuahua',
     'Mountain'               => 'America/Denver',
     // 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
-    'US Mountain'            => 'America/Phoenix',
-    'Canada Central'         => 'America/Edmonton',
-    'Central America'        => 'America/Guatemala',
-    'Central'                => 'America/Chicago',
+    'US Mountain'     => 'America/Phoenix',
+    'Canada Central'  => 'America/Edmonton',
+    'Central America' => 'America/Guatemala',
+    'Central'         => 'America/Chicago',
     // 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
-    'Mexico'                 => 'America/Mexico_City',
-    'Eastern'                => 'America/New_York',
-    'SA Pacific'             => 'America/Bogota',
-    'US Eastern'             => 'America/Indiana/Indianapolis',
-    'Venezuela'              => 'America/Caracas',
-    'Atlantic'               => 'America/Halifax',
-    'Central Brazilian'      => 'America/Manaus',
-    'Pacific SA'             => 'America/Santiago',
-    'SA Western'             => 'America/La_Paz',
-    'Newfoundland'           => 'America/St_Johns',
-    'Argentina'              => 'America/Argentina/Buenos_Aires',
-    'E. South America'       => 'America/Belem',
-    'Greenland'              => 'America/Godthab',
-    'Montevideo'             => 'America/Montevideo',
-    'SA Eastern'             => 'America/Belem',
+    'Mexico'            => 'America/Mexico_City',
+    'Eastern'           => 'America/New_York',
+    'SA Pacific'        => 'America/Bogota',
+    'US Eastern'        => 'America/Indiana/Indianapolis',
+    'Venezuela'         => 'America/Caracas',
+    'Atlantic'          => 'America/Halifax',
+    'Central Brazilian' => 'America/Manaus',
+    'Pacific SA'        => 'America/Santiago',
+    'SA Western'        => 'America/La_Paz',
+    'Newfoundland'      => 'America/St_Johns',
+    'Argentina'         => 'America/Argentina/Buenos_Aires',
+    'E. South America'  => 'America/Belem',
+    'Greenland'         => 'America/Godthab',
+    'Montevideo'        => 'America/Montevideo',
+    'SA Eastern'        => 'America/Belem',
     // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
-    'Azores'                 => 'Atlantic/Azores',
-    'Cape Verde'             => 'Atlantic/Cape_Verde',
-    'Greenwich'              => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
-    'Morocco'                => 'Africa/Casablanca',
-    'Central Europe'         => 'Europe/Prague',
-    'Central European'       => 'Europe/Sarajevo',
-    'Romance'                => 'Europe/Paris',
-    'W. Central Africa'      => 'Africa/Lagos', // Best guess
-    'W. Europe'              => 'Europe/Amsterdam',
-    'E. Europe'              => 'Europe/Minsk',
-    'Egypt'                  => 'Africa/Cairo',
-    'FLE'                    => 'Europe/Helsinki',
-    'GTB'                    => 'Europe/Athens',
-    'Israel'                 => 'Asia/Jerusalem',
-    'Jordan'                 => 'Asia/Amman',
-    'Middle East'            => 'Asia/Beirut',
-    'Namibia'                => 'Africa/Windhoek',
-    'South Africa'           => 'Africa/Harare',
-    'Arab'                   => 'Asia/Kuwait',
-    'Arabic'                 => 'Asia/Baghdad',
-    'E. Africa'              => 'Africa/Nairobi',
-    'Georgian'               => 'Asia/Tbilisi',
-    'Russian'                => 'Europe/Moscow',
-    'Iran'                   => 'Asia/Tehran',
-    'Arabian'                => 'Asia/Muscat',
-    'Armenian'               => 'Asia/Yerevan',
-    'Azerbijan'              => 'Asia/Baku',
-    'Caucasus'               => 'Asia/Yerevan',
-    'Mauritius'              => 'Indian/Mauritius',
-    'Afghanistan'            => 'Asia/Kabul',
-    'Ekaterinburg'           => 'Asia/Yekaterinburg',
-    'Pakistan'               => 'Asia/Karachi',
-    'West Asia'              => 'Asia/Tashkent',
-    'India'                  => 'Asia/Calcutta',
-    'Sri Lanka'              => 'Asia/Colombo',
-    'Nepal'                  => 'Asia/Kathmandu',
-    'Central Asia'           => 'Asia/Dhaka',
-    'N. Central Asia'        => 'Asia/Almaty',
-    'Myanmar'                => 'Asia/Rangoon',
-    'North Asia'             => 'Asia/Krasnoyarsk',
-    'SE Asia'                => 'Asia/Bangkok',
-    'China'                  => 'Asia/Shanghai',
-    'North Asia East'        => 'Asia/Irkutsk',
-    'Singapore'              => 'Asia/Singapore',
-    'Taipei'                 => 'Asia/Taipei',
-    'W. Australia'           => 'Australia/Perth',
-    'Korea'                  => 'Asia/Seoul',
-    'Tokyo'                  => 'Asia/Tokyo',
-    'Yakutsk'                => 'Asia/Yakutsk',
-    'AUS Central'            => 'Australia/Darwin',
-    'Cen. Australia'         => 'Australia/Adelaide',
-    'AUS Eastern'            => 'Australia/Sydney',
-    'E. Australia'           => 'Australia/Brisbane',
-    'Tasmania'               => 'Australia/Hobart',
-    'Vladivostok'            => 'Asia/Vladivostok',
-    'West Pacific'           => 'Pacific/Guam',
-    'Central Pacific'        => 'Asia/Magadan',
-    'Fiji'                   => 'Pacific/Fiji',
-    'New Zealand'            => 'Pacific/Auckland',
-    'Tonga'                  => 'Pacific/Tongatapu',
+    'Azores'            => 'Atlantic/Azores',
+    'Cape Verde'        => 'Atlantic/Cape_Verde',
+    'Greenwich'         => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
+    'Morocco'           => 'Africa/Casablanca',
+    'Central Europe'    => 'Europe/Prague',
+    'Central European'  => 'Europe/Sarajevo',
+    'Romance'           => 'Europe/Paris',
+    'W. Central Africa' => 'Africa/Lagos', // Best guess
+    'W. Europe'         => 'Europe/Amsterdam',
+    'E. Europe'         => 'Europe/Minsk',
+    'Egypt'             => 'Africa/Cairo',
+    'FLE'               => 'Europe/Helsinki',
+    'GTB'               => 'Europe/Athens',
+    'Israel'            => 'Asia/Jerusalem',
+    'Jordan'            => 'Asia/Amman',
+    'Middle East'       => 'Asia/Beirut',
+    'Namibia'           => 'Africa/Windhoek',
+    'South Africa'      => 'Africa/Harare',
+    'Arab'              => 'Asia/Kuwait',
+    'Arabic'            => 'Asia/Baghdad',
+    'E. Africa'         => 'Africa/Nairobi',
+    'Georgian'          => 'Asia/Tbilisi',
+    'Russian'           => 'Europe/Moscow',
+    'Iran'              => 'Asia/Tehran',
+    'Arabian'           => 'Asia/Muscat',
+    'Armenian'          => 'Asia/Yerevan',
+    'Azerbijan'         => 'Asia/Baku',
+    'Caucasus'          => 'Asia/Yerevan',
+    'Mauritius'         => 'Indian/Mauritius',
+    'Afghanistan'       => 'Asia/Kabul',
+    'Ekaterinburg'      => 'Asia/Yekaterinburg',
+    'Pakistan'          => 'Asia/Karachi',
+    'West Asia'         => 'Asia/Tashkent',
+    'India'             => 'Asia/Calcutta',
+    'Sri Lanka'         => 'Asia/Colombo',
+    'Nepal'             => 'Asia/Kathmandu',
+    'Central Asia'      => 'Asia/Dhaka',
+    'N. Central Asia'   => 'Asia/Almaty',
+    'Myanmar'           => 'Asia/Rangoon',
+    'North Asia'        => 'Asia/Krasnoyarsk',
+    'SE Asia'           => 'Asia/Bangkok',
+    'China'             => 'Asia/Shanghai',
+    'North Asia East'   => 'Asia/Irkutsk',
+    'Singapore'         => 'Asia/Singapore',
+    'Taipei'            => 'Asia/Taipei',
+    'W. Australia'      => 'Australia/Perth',
+    'Korea'             => 'Asia/Seoul',
+    'Tokyo'             => 'Asia/Tokyo',
+    'Yakutsk'           => 'Asia/Yakutsk',
+    'AUS Central'       => 'Australia/Darwin',
+    'Cen. Australia'    => 'Australia/Adelaide',
+    'AUS Eastern'       => 'Australia/Sydney',
+    'E. Australia'      => 'Australia/Brisbane',
+    'Tasmania'          => 'Australia/Hobart',
+    'Vladivostok'       => 'Asia/Vladivostok',
+    'West Pacific'      => 'Pacific/Guam',
+    'Central Pacific'   => 'Asia/Magadan',
+    'Fiji'              => 'Pacific/Fiji',
+    'New Zealand'       => 'Pacific/Auckland',
+    'Tonga'             => 'Pacific/Tongatapu',
 ];
diff --git a/vendor/sabre/vobject/lib/timezonedata/windowszones.php b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
index ac69847cc..29f3a6cb8 100644
--- a/vendor/sabre/vobject/lib/timezonedata/windowszones.php
+++ b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
@@ -3,28 +3,33 @@
 /**
  * Automatically generated timezone file
  *
- * Last update: 2015-07-27T16:56:36-04:00
+ * Last update: 2016-08-24T17:35:38-04:00
  * Source: http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
  *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @license http://sabre.io/license/ Modified BSD License
  */
 
-return [
+return  [
   'AUS Central Standard Time'       => 'Australia/Darwin',
   'AUS Eastern Standard Time'       => 'Australia/Sydney',
   'Afghanistan Standard Time'       => 'Asia/Kabul',
   'Alaskan Standard Time'           => 'America/Anchorage',
+  'Aleutian Standard Time'          => 'America/Adak',
+  'Altai Standard Time'             => 'Asia/Barnaul',
   'Arab Standard Time'              => 'Asia/Riyadh',
   'Arabian Standard Time'           => 'Asia/Dubai',
   'Arabic Standard Time'            => 'Asia/Baghdad',
   'Argentina Standard Time'         => 'America/Buenos_Aires',
+  'Astrakhan Standard Time'         => 'Europe/Astrakhan',
   'Atlantic Standard Time'          => 'America/Halifax',
+  'Aus Central W. Standard Time'    => 'Australia/Eucla',
   'Azerbaijan Standard Time'        => 'Asia/Baku',
   'Azores Standard Time'            => 'Atlantic/Azores',
   'Bahia Standard Time'             => 'America/Bahia',
   'Bangladesh Standard Time'        => 'Asia/Dhaka',
   'Belarus Standard Time'           => 'Europe/Minsk',
+  'Bougainville Standard Time'      => 'Pacific/Bougainville',
   'Canada Central Standard Time'    => 'America/Regina',
   'Cape Verde Standard Time'        => 'Atlantic/Cape_Verde',
   'Caucasus Standard Time'          => 'Asia/Yerevan',
@@ -37,11 +42,15 @@ return [
   'Central Pacific Standard Time'   => 'Pacific/Guadalcanal',
   'Central Standard Time'           => 'America/Chicago',
   'Central Standard Time (Mexico)'  => 'America/Mexico_City',
+  'Chatham Islands Standard Time'   => 'Pacific/Chatham',
   'China Standard Time'             => 'Asia/Shanghai',
+  'Cuba Standard Time'              => 'America/Havana',
   'Dateline Standard Time'          => 'Etc/GMT+12',
   'E. Africa Standard Time'         => 'Africa/Nairobi',
   'E. Australia Standard Time'      => 'Australia/Brisbane',
+  'E. Europe Standard Time'         => 'Europe/Chisinau',
   'E. South America Standard Time'  => 'America/Sao_Paulo',
+  'Easter Island Standard Time'     => 'Pacific/Easter',
   'Eastern Standard Time'           => 'America/New_York',
   'Eastern Standard Time (Mexico)'  => 'America/Cancun',
   'Egypt Standard Time'             => 'Africa/Cairo',
@@ -53,6 +62,7 @@ return [
   'Georgian Standard Time'          => 'Asia/Tbilisi',
   'Greenland Standard Time'         => 'America/Godthab',
   'Greenwich Standard Time'         => 'Atlantic/Reykjavik',
+  'Haiti Standard Time'             => 'America/Port-au-Prince',
   'Hawaiian Standard Time'          => 'Pacific/Honolulu',
   'India Standard Time'             => 'Asia/Calcutta',
   'Iran Standard Time'              => 'Asia/Tehran',
@@ -62,7 +72,9 @@ return [
   'Korea Standard Time'             => 'Asia/Seoul',
   'Libya Standard Time'             => 'Africa/Tripoli',
   'Line Islands Standard Time'      => 'Pacific/Kiritimati',
+  'Lord Howe Standard Time'         => 'Australia/Lord_Howe',
   'Magadan Standard Time'           => 'Asia/Magadan',
+  'Marquesas Standard Time'         => 'Pacific/Marquesas',
   'Mauritius Standard Time'         => 'Indian/Mauritius',
   'Middle East Standard Time'       => 'Asia/Beirut',
   'Montevideo Standard Time'        => 'America/Montevideo',
@@ -75,11 +87,13 @@ return [
   'Nepal Standard Time'             => 'Asia/Katmandu',
   'New Zealand Standard Time'       => 'Pacific/Auckland',
   'Newfoundland Standard Time'      => 'America/St_Johns',
+  'Norfolk Standard Time'           => 'Pacific/Norfolk',
   'North Asia East Standard Time'   => 'Asia/Irkutsk',
   'North Asia Standard Time'        => 'Asia/Krasnoyarsk',
+  'North Korea Standard Time'       => 'Asia/Pyongyang',
   'Pacific SA Standard Time'        => 'America/Santiago',
   'Pacific Standard Time'           => 'America/Los_Angeles',
-  'Pacific Standard Time (Mexico)'  => 'America/Santa_Isabel',
+  'Pacific Standard Time (Mexico)'  => 'America/Tijuana',
   'Pakistan Standard Time'          => 'Asia/Karachi',
   'Paraguay Standard Time'          => 'America/Asuncion',
   'Romance Standard Time'           => 'Europe/Paris',
@@ -91,6 +105,8 @@ return [
   'SA Pacific Standard Time'        => 'America/Bogota',
   'SA Western Standard Time'        => 'America/La_Paz',
   'SE Asia Standard Time'           => 'Asia/Bangkok',
+  'Saint Pierre Standard Time'      => 'America/Miquelon',
+  'Sakhalin Standard Time'          => 'Asia/Sakhalin',
   'Samoa Standard Time'             => 'Pacific/Apia',
   'Singapore Standard Time'         => 'Asia/Singapore',
   'South Africa Standard Time'      => 'Africa/Johannesburg',
@@ -98,14 +114,20 @@ return [
   'Syria Standard Time'             => 'Asia/Damascus',
   'Taipei Standard Time'            => 'Asia/Taipei',
   'Tasmania Standard Time'          => 'Australia/Hobart',
+  'Tocantins Standard Time'         => 'America/Araguaina',
   'Tokyo Standard Time'             => 'Asia/Tokyo',
+  'Tomsk Standard Time'             => 'Asia/Tomsk',
   'Tonga Standard Time'             => 'Pacific/Tongatapu',
+  'Transbaikal Standard Time'       => 'Asia/Chita',
   'Turkey Standard Time'            => 'Europe/Istanbul',
+  'Turks And Caicos Standard Time'  => 'America/Grand_Turk',
   'US Eastern Standard Time'        => 'America/Indianapolis',
   'US Mountain Standard Time'       => 'America/Phoenix',
   'UTC'                             => 'Etc/GMT',
   'UTC+12'                          => 'Etc/GMT-12',
   'UTC-02'                          => 'Etc/GMT+2',
+  'UTC-08'                          => 'Etc/GMT+8',
+  'UTC-09'                          => 'Etc/GMT+9',
   'UTC-11'                          => 'Etc/GMT+11',
   'Ulaanbaatar Standard Time'       => 'Asia/Ulaanbaatar',
   'Venezuela Standard Time'         => 'America/Caracas',
@@ -113,7 +135,9 @@ return [
   'W. Australia Standard Time'      => 'Australia/Perth',
   'W. Central Africa Standard Time' => 'Africa/Lagos',
   'W. Europe Standard Time'         => 'Europe/Berlin',
+  'W. Mongolia Standard Time'       => 'Asia/Hovd',
   'West Asia Standard Time'         => 'Asia/Tashkent',
+  'West Bank Standard Time'         => 'Asia/Hebron',
   'West Pacific Standard Time'      => 'Pacific/Port_Moresby',
   'Yakutsk Standard Time'           => 'Asia/Yakutsk',
 ];