diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py
index 14c38aa2..140bf627 100644
--- a/python/phonenumbers/carrierdata/data0.py
+++ b/python/phonenumbers/carrierdata/data0.py
@@ -1304,7 +1304,9 @@
  '25670':{'en': 'Airtel'},
  '25671':{'en': 'UTL'},
  '256720':{'en': 'Smile'},
+ '256724':{'en': 'Hamilton Telecom'},
  '256726':{'en': 'Tangerine'},
+ '256728':{'en': 'Talkio'},
  '25673':{'en': 'Hamilton Telecom'},
  '25674':{'en': 'Sure Telecom'},
  '25675':{'en': 'Airtel'},
@@ -2550,10 +2552,12 @@
  '3516093':{'en': 'NOS'},
  '351639230':{'en': 'NOS'},
  '351639233':{'en': 'Digi Communications'},
+ '351639234':{'en': 'G9 Telecom'},
  '35163929':{'en': 'NOS'},
  '3516393':{'en': 'NOS'},
  '351659230':{'en': 'NOS'},
  '351659233':{'en': 'Digi Communications'},
+ '351659234':{'en': 'G9 Telecom'},
  '35165929':{'en': 'NOS'},
  '3516593':{'en': 'NOS'},
  '351669230':{'en': 'NOS'},
@@ -2574,6 +2578,7 @@
  '3519231':{'en': 'Vodafone'},
  '3519232':{'en': 'MEO'},
  '3519233':{'en': 'Digi Communications'},
+ '3519234':{'en': 'G9 Telecom'},
  '351924':{'en': 'MEO'},
  '351925':{'en': 'MEO'},
  '351926':{'en': 'MEO'},
@@ -3760,6 +3765,7 @@
  '423659':{'en': 'Telecom Liechtenstein'},
  '42366':{'en': 'Telecom Liechtenstein'},
  '423661':{'en': 'Dimoco'},
+ '423666':{'en': 'Datamobile AG'},
  '42373':{'en': 'Telecom Liechtenstein'},
  '42374':{'en': 'First Mobile'},
  '42377':{'en': 'Swisscom'},
@@ -6413,9 +6419,11 @@
  '474741':{'en': 'telenor norge'},
  '474742':{'en': 'telenor norge'},
  '474743':{'en': 'telenor norge'},
- '47475':{'en': 'altibox'},
- '474750':{'en': 'telenor norge'},
- '474751':{'en': 'telenor norge'},
+ '47475':{'en': 'telenor norge'},
+ '474756':{'en': 'altibox'},
+ '474757':{'en': 'altibox'},
+ '474758':{'en': 'altibox'},
+ '474759':{'en': 'altibox'},
  '47476':{'en': 'telenor norge'},
  '474769':{'en': 'telia'},
  '47477':{'en': 'telia'},
@@ -6497,10 +6505,8 @@
  '479258':{'en': 'telenor norge'},
  '479259':{'en': 'telenor norge'},
  '47927':{'en': 'telenor norge'},
- '47929':{'en': 'telenor norge'},
- '479297':{'en': 'ice norge'},
- '479298':{'en': 'ice norge'},
- '479299':{'en': 'ice norge'},
+ '47929':{'en': 'ice norge'},
+ '479290':{'en': 'telenor norge'},
  '47930':{'en': 'telia'},
  '479310':{'en': 'telenor norge'},
  '479311':{'en': 'telenor norge'},
@@ -6683,8 +6689,18 @@
  '479987':{'en': 'telia'},
  '479988':{'en': 'telia'},
  '479989':{'en': 'telia'},
+ '482110':{'en': 'Plus'},
  '482111':{'en': 'Polska Spoka Gazownictwa Sp'},
- '482113':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821130':{'en': 'Plus'},
+ '4821131':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821132':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821133':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821134':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821135':{'en': 'Polska Spoka Gazownictwa Sp'},
+ '4821136':{'en': 'Plus'},
+ '4821137':{'en': 'Plus'},
+ '4821138':{'en': 'Plus'},
+ '4821139':{'en': 'Plus'},
  '482114':{'en': 'Plus'},
  '482115':{'en': 'Plus'},
  '48212':{'en': 'Orange'},
@@ -6709,6 +6725,7 @@
  '4845957':{'en': 'BSG ESTONIA OU'},
  '4845958':{'en': 'TELESTRADA S.A.'},
  '4845959':{'en': 'TELESTRADA S.A.'},
+ '484596':{'en': 'Plus'},
  '484598':{'en': 'Plus'},
  '4850':{'en': 'Orange'},
  '4851':{'en': 'Orange'},
@@ -6881,7 +6898,6 @@
  '4873930':{'en': 'Play'},
  '4873990':{'en': 'Play'},
  '4873991':{'en': 'AGILE TELECOM POLAND'},
- '4873992':{'en': 'MobiWeb Telecom Limited'},
  '4873993':{'en': 'SIA NetBalt'},
  '4873997':{'en': 'Play'},
  '4873998':{'en': 'Play'},
@@ -6904,10 +6920,16 @@
  '48783':{'en': 'Plus'},
  '48784':{'en': 'T-Mobile'},
  '48785':{'en': 'Plus'},
- '487860':{'en': 'Plus'},
  '4878600':{'en': 'JMDI'},
+ '4878601':{'en': 'Plus'},
+ '4878602':{'en': 'Plus'},
+ '4878603':{'en': 'Plus'},
+ '4878604':{'en': 'Plus'},
+ '4878605':{'en': 'Plus'},
+ '4878606':{'en': 'Plus'},
  '4878607':{'en': 'Play'},
  '4878608':{'en': 'Play'},
+ '4878609':{'en': 'Plus'},
  '487861':{'en': 'Play'},
  '487862':{'en': 'Play'},
  '487863':{'en': 'Orange'},
@@ -6918,7 +6940,11 @@
  '4878671':{'en': 'Plus'},
  '4878672':{'en': 'Plus'},
  '4878673':{'en': 'Plus'},
+ '4878674':{'en': 'Plus'},
+ '4878675':{'en': 'Plus'},
+ '4878676':{'en': 'Plus'},
  '4878678':{'en': 'Play'},
+ '4878679':{'en': 'Plus'},
  '487868':{'en': 'Orange'},
  '487869':{'en': 'Orange'},
  '48787':{'en': 'T-Mobile'},
@@ -6957,7 +6983,14 @@
  '488841':{'en': 'T-Mobile'},
  '488842':{'en': 'T-Mobile'},
  '488843':{'en': 'Play'},
+ '4888441':{'en': 'Plus'},
+ '4888442':{'en': 'Plus'},
+ '4888443':{'en': 'Plus'},
  '4888444':{'en': 'CARITAS'},
+ '4888446':{'en': 'Plus'},
+ '4888447':{'en': 'Plus'},
+ '4888449':{'en': 'Plus'},
+ '488845':{'en': 'Plus'},
  '488846':{'en': 'Play'},
  '488847':{'en': 'Play'},
  '488848':{'en': 'Play'},
@@ -9986,37 +10019,4 @@
  '553199186':{'en': 'TIM'},
  '553199187':{'en': 'TIM'},
  '553199188':{'en': 'TIM'},
- '553199189':{'en': 'TIM'},
- '553199191':{'en': 'TIM'},
- '553199192':{'en': 'TIM'},
- '553199193':{'en': 'TIM'},
- '553199194':{'en': 'TIM'},
- '553199195':{'en': 'TIM'},
- '553199196':{'en': 'TIM'},
- '553199197':{'en': 'TIM'},
- '553199198':{'en': 'TIM'},
- '553199199':{'en': 'TIM'},
- '5531992':{'en': 'TIM'},
- '5531993':{'en': 'TIM'},
- '553199401':{'en': 'TIM'},
- '553199402':{'en': 'TIM'},
- '553199403':{'en': 'TIM'},
- '553199404':{'en': 'TIM'},
- '553199405':{'en': 'TIM'},
- '553199406':{'en': 'TIM'},
- '553199407':{'en': 'TIM'},
- '553199408':{'en': 'TIM'},
- '553199409':{'en': 'TIM'},
- '553199411':{'en': 'TIM'},
- '553199412':{'en': 'TIM'},
- '553199413':{'en': 'TIM'},
- '553199414':{'en': 'TIM'},
- '553199415':{'en': 'TIM'},
- '553199416':{'en': 'TIM'},
- '553199601':{'en': 'Telemig Celular'},
- '553199602':{'en': 'Telemig Celular'},
- '553199603':{'en': 'Telemig Celular'},
- '553199604':{'en': 'Telemig Celular'},
- '553199605':{'en': 'Telemig Celular'},
- '553199606':{'en': 'Telemig Celular'},
 }
diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py
index 561ae696..516fd219 100644
--- a/python/phonenumbers/carrierdata/data1.py
+++ b/python/phonenumbers/carrierdata/data1.py
@@ -19,6 +19,39 @@
 # limitations under the License.
 
 data = {
+ '553199189':{'en': 'TIM'},
+ '553199191':{'en': 'TIM'},
+ '553199192':{'en': 'TIM'},
+ '553199193':{'en': 'TIM'},
+ '553199194':{'en': 'TIM'},
+ '553199195':{'en': 'TIM'},
+ '553199196':{'en': 'TIM'},
+ '553199197':{'en': 'TIM'},
+ '553199198':{'en': 'TIM'},
+ '553199199':{'en': 'TIM'},
+ '5531992':{'en': 'TIM'},
+ '5531993':{'en': 'TIM'},
+ '553199401':{'en': 'TIM'},
+ '553199402':{'en': 'TIM'},
+ '553199403':{'en': 'TIM'},
+ '553199404':{'en': 'TIM'},
+ '553199405':{'en': 'TIM'},
+ '553199406':{'en': 'TIM'},
+ '553199407':{'en': 'TIM'},
+ '553199408':{'en': 'TIM'},
+ '553199409':{'en': 'TIM'},
+ '553199411':{'en': 'TIM'},
+ '553199412':{'en': 'TIM'},
+ '553199413':{'en': 'TIM'},
+ '553199414':{'en': 'TIM'},
+ '553199415':{'en': 'TIM'},
+ '553199416':{'en': 'TIM'},
+ '553199601':{'en': 'Telemig Celular'},
+ '553199602':{'en': 'Telemig Celular'},
+ '553199603':{'en': 'Telemig Celular'},
+ '553199604':{'en': 'Telemig Celular'},
+ '553199605':{'en': 'Telemig Celular'},
+ '553199606':{'en': 'Telemig Celular'},
  '553199607':{'en': 'Telemig Celular'},
  '553199608':{'en': 'Telemig Celular'},
  '553199609':{'en': 'Telemig Celular'},
@@ -9986,37 +10019,4 @@
  '569961':{'en': 'Entel'},
  '569962':{'en': 'Movistar'},
  '569963':{'en': 'Movistar'},
- '569964':{'en': 'Movistar'},
- '569965':{'en': 'Movistar'},
- '569966':{'en': 'Movistar'},
- '569967':{'en': 'Entel'},
- '569968':{'en': 'Claro'},
- '5699680':{'en': 'Movistar'},
- '5699681':{'en': 'Movistar'},
- '569969':{'en': 'Entel'},
- '56997':{'en': 'Movistar'},
- '569971':{'en': 'Entel'},
- '569977':{'en': 'Entel'},
- '569978':{'en': 'Entel'},
- '569979':{'en': 'Entel'},
- '56998':{'en': 'Entel'},
- '569980':{'en': 'Claro'},
- '569984':{'en': 'Claro'},
- '569985':{'en': 'Claro'},
- '569986':{'en': 'Claro'},
- '569990':{'en': 'Movistar'},
- '569991':{'en': 'Entel'},
- '569992':{'en': 'Claro'},
- '569993':{'en': 'Entel'},
- '569994':{'en': 'Entel'},
- '569995':{'en': 'Movistar'},
- '5699960':{'en': 'Movistar'},
- '5699961':{'en': 'Movistar'},
- '5699962':{'en': 'Movistar'},
- '5699963':{'en': 'Movistar'},
- '5699964':{'en': 'Movistar'},
- '5699965':{'en': 'Entel'},
- '5699966':{'en': 'Entel'},
- '5699967':{'en': 'Entel'},
- '5699968':{'en': 'Entel'},
 }
diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py
index cfd74f9d..7edaa9ab 100644
--- a/python/phonenumbers/carrierdata/data2.py
+++ b/python/phonenumbers/carrierdata/data2.py
@@ -19,6 +19,39 @@
 # limitations under the License.
 
 data = {
+ '569964':{'en': 'Movistar'},
+ '569965':{'en': 'Movistar'},
+ '569966':{'en': 'Movistar'},
+ '569967':{'en': 'Entel'},
+ '569968':{'en': 'Claro'},
+ '5699680':{'en': 'Movistar'},
+ '5699681':{'en': 'Movistar'},
+ '569969':{'en': 'Entel'},
+ '56997':{'en': 'Movistar'},
+ '569971':{'en': 'Entel'},
+ '569977':{'en': 'Entel'},
+ '569978':{'en': 'Entel'},
+ '569979':{'en': 'Entel'},
+ '56998':{'en': 'Entel'},
+ '569980':{'en': 'Claro'},
+ '569984':{'en': 'Claro'},
+ '569985':{'en': 'Claro'},
+ '569986':{'en': 'Claro'},
+ '569990':{'en': 'Movistar'},
+ '569991':{'en': 'Entel'},
+ '569992':{'en': 'Claro'},
+ '569993':{'en': 'Entel'},
+ '569994':{'en': 'Entel'},
+ '569995':{'en': 'Movistar'},
+ '5699960':{'en': 'Movistar'},
+ '5699961':{'en': 'Movistar'},
+ '5699962':{'en': 'Movistar'},
+ '5699963':{'en': 'Movistar'},
+ '5699964':{'en': 'Movistar'},
+ '5699965':{'en': 'Entel'},
+ '5699966':{'en': 'Entel'},
+ '5699967':{'en': 'Entel'},
+ '5699968':{'en': 'Entel'},
  '5699969':{'en': 'Entel'},
  '5699970':{'en': 'Movistar'},
  '5699971':{'en': 'Movistar'},
@@ -368,6 +401,8 @@
  '59069133':{'en': 'Orange'},
  '59069134':{'en': 'Orange'},
  '59069135':{'en': 'Orange'},
+ '590694':{'en': 'Digicel'},
+ '590696':{'en': 'Digicel'},
  '59170':{'en': 'Nuevatel'},
  '591710':{'en': 'Entel'},
  '591711':{'en': 'Entel'},
@@ -3914,7 +3949,7 @@
  '8217':{'en': 'SKTellink', 'ko': u('SK \ud154\ub9c1\ud06c')},
  '8218':{'en': 'KT', 'ko': 'KT'},
  '8219':{'en': 'LG U+', 'ko': u('\ub370\uc774\ucf64')},
- '843':{'en': 'Viettel Mobile'},
+ '843':{'en': 'Viettel'},
  '8430':{'en': 'MobiFone'},
  '8451':{'en': 'MobiFone'},
  '8452':{'en': 'Vietnamobile'},
@@ -3928,7 +3963,7 @@
  '8483':{'en': 'Vinaphone'},
  '8484':{'en': 'Vinaphone'},
  '8485':{'en': 'Vinaphone'},
- '8486':{'en': 'Viettel Mobile'},
+ '8486':{'en': 'Viettel'},
  '8487':{'en': 'Vinaphone'},
  '8488':{'en': 'Vinaphone'},
  '8489':{'en': 'MobiFone'},
@@ -3952,7 +3987,11 @@
  '850193':{'en': 'KPTC'},
  '852440':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
  '852441':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
+ '852442':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
+ '852443':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
  '852444':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
+ '8524441':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
+ '8524442':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
  '852445':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
  '852446':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
  '852447':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
@@ -4233,9 +4272,13 @@
  '8527074':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')},
  '8527075':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')},
  '8527076':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
+ '8527077':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
+ '8527078':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
  '852708':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
  '852709':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
  '852840':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
+ '852841':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
+ '852842':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
  '8528480':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': 'Handy'},
  '8528481':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u65b0\u79fb\u52d5\u901a\u8a0a')},
  '8528482':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')},
diff --git a/python/phonenumbers/data/alt_format_34.py b/python/phonenumbers/data/alt_format_34.py
index b013d8e0..989e8e7b 100644
--- a/python/phonenumbers/data/alt_format_34.py
+++ b/python/phonenumbers/data/alt_format_34.py
@@ -1,4 +1,4 @@
 """Auto-generated file, do not edit by hand. 34 metadata"""
 from ..phonemetadata import NumberFormat
 
-PHONE_ALT_FORMAT_34 = [NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[5-7]|80[367]|90[12]|[89][1-8]']), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['9(?:0[12]|[1-8])'])]
+PHONE_ALT_FORMAT_34 = [NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[5-7]|80[367]|90[1289]|[89][1-8]']), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['9(?:0[1289]|[1-8])'])]
diff --git a/python/phonenumbers/data/alt_format_385.py b/python/phonenumbers/data/alt_format_385.py
index 12066558..6f7070a5 100644
--- a/python/phonenumbers/data/alt_format_385.py
+++ b/python/phonenumbers/data/alt_format_385.py
@@ -1,4 +1,4 @@
 """Auto-generated file, do not edit by hand. 385 metadata"""
 from ..phonemetadata import NumberFormat
 
-PHONE_ALT_FORMAT_385 = [NumberFormat(pattern='(\\d)(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d)(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-69]']), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['6'])]
+PHONE_ALT_FORMAT_385 = [NumberFormat(pattern='(\\d)(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d)(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-69]|76']), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['6'])]
diff --git a/python/phonenumbers/data/region_BL.py b/python/phonenumbers/data/region_BL.py
index 58d10f16..a9811bab 100644
--- a/python/phonenumbers/data/region_BL.py
+++ b/python/phonenumbers/data/region_BL.py
@@ -4,9 +4,9 @@
 PHONE_METADATA_BL = PhoneMetadata(id='BL', country_code=590, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='590\\d{6}|(?:69|80|9\\d)\\d{7}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='590(?:2[7-9]|3[3-7]|5[12]|87)\\d{4}', example_number='590271234', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}', example_number='690001234', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', example_number='690001234', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80[0-5]\\d{6}', example_number='800012345', possible_length=(9,)),
-    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:395|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
+    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
     national_prefix='0',
     national_prefix_for_parsing='0',
     mobile_number_portable_region=True)
diff --git a/python/phonenumbers/data/region_BS.py b/python/phonenumbers/data/region_BS.py
index 170f3894..a6f942db 100644
--- a/python/phonenumbers/data/region_BS.py
+++ b/python/phonenumbers/data/region_BS.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_BS = PhoneMetadata(id='BS', country_code=1, international_prefix='011',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:242|[58]\\d\\d|900)\\d{7}', possible_length=(10,), possible_length_local_only=(7,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[347]|8[0-4]|9[2-467])|461|502|6(?:0[1-5]|12|2[013]|[45]0|7[67]|8[78]|9[89])|7(?:02|88))\\d{4}', example_number='2423456789', possible_length=(10,), possible_length_local_only=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|[89]9))\\d{4}', example_number='2423591234', possible_length=(10,), possible_length_local_only=(7,)),
+    mobile=PhoneNumberDesc(national_number_pattern='242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|3[0-4]|[89]9))\\d{4}', example_number='2423591234', possible_length=(10,), possible_length_local_only=(7,)),
     toll_free=PhoneNumberDesc(national_number_pattern='242300\\d{4}|8(?:00|33|44|55|66|77|88)[2-9]\\d{6}', example_number='8002123456', possible_length=(10,), possible_length_local_only=(7,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900[2-9]\\d{6}', example_number='9002123456', possible_length=(10,)),
     personal_number=PhoneNumberDesc(national_number_pattern='52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}', example_number='5002345678', possible_length=(10,)),
diff --git a/python/phonenumbers/data/region_GP.py b/python/phonenumbers/data/region_GP.py
index 3bd1935a..55d24817 100644
--- a/python/phonenumbers/data/region_GP.py
+++ b/python/phonenumbers/data/region_GP.py
@@ -4,9 +4,9 @@
 PHONE_METADATA_GP = PhoneMetadata(id='GP', country_code=590, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='590\\d{6}|(?:69|80|9\\d)\\d{7}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1-9]|5[3-579]|[68][0-689]|7[08]|9\\d)\\d{4}', example_number='590201234', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}', example_number='690001234', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', example_number='690001234', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80[0-5]\\d{6}', example_number='800012345', possible_length=(9,)),
-    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:395|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
+    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
     national_prefix='0',
     national_prefix_for_parsing='0',
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[569]'], national_prefix_formatting_rule='0\\1'),
diff --git a/python/phonenumbers/data/region_HK.py b/python/phonenumbers/data/region_HK.py
index a107d866..4959fc33 100644
--- a/python/phonenumbers/data/region_HK.py
+++ b/python/phonenumbers/data/region_HK.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_HK = PhoneMetadata(id='HK', country_code=852, international_prefix='00(?:30|5[09]|[126-9]?)',
     general_desc=PhoneNumberDesc(national_number_pattern='8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}', possible_length=(5, 6, 7, 8, 9, 11)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}', example_number='21234567', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[05-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-6]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[015-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900(?:[0-24-9]\\d{7}|3\\d{1,4})', example_number='90012345678', possible_length=(5, 6, 7, 8, 11)),
     personal_number=PhoneNumberDesc(national_number_pattern='8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}', example_number='81123456', possible_length=(8,)),
diff --git a/python/phonenumbers/data/region_HR.py b/python/phonenumbers/data/region_HR.py
index 6405a048..c30c5de3 100644
--- a/python/phonenumbers/data/region_HR.py
+++ b/python/phonenumbers/data/region_HR.py
@@ -14,8 +14,8 @@
     number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['6[01]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['8'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d)(\\d{4})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['1'], national_prefix_formatting_rule='0\\1'),
-        NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[67]'], national_prefix_formatting_rule='0\\1'),
+        NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['6|7[245]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['9'], national_prefix_formatting_rule='0\\1'),
-        NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-5]'], national_prefix_formatting_rule='0\\1'),
+        NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-57]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['8'], national_prefix_formatting_rule='0\\1')],
     mobile_number_portable_region=True)
diff --git a/python/phonenumbers/data/region_KW.py b/python/phonenumbers/data/region_KW.py
index 577fe9df..97f457fb 100644
--- a/python/phonenumbers/data/region_KW.py
+++ b/python/phonenumbers/data/region_KW.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_KW = PhoneMetadata(id='KW', country_code=965, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='18\\d{5}|(?:[2569]\\d|41)\\d{6}', possible_length=(7, 8)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2(?:[23]\\d\\d|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7]))\\d{4}', example_number='22345678', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|66)|222|3[36]3|444|7(?:0[013-9]|[67]\\d)|888|9(?:[069]\\d|3[039]))|9(?:(?:0[09]|[4679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}', example_number='50012345', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|6[16])|2[26]2|3[36]3|4[46]4|7(?:0[013-9]|[67]\\d)|8[68]8|9(?:[069]\\d|3[039]))|9(?:(?:[04679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}', example_number='50012345', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='18\\d{5}', example_number='1801234', possible_length=(7,)),
     number_format=[NumberFormat(pattern='(\\d{4})(\\d{3,4})', format='\\1 \\2', leading_digits_pattern=['[169]|2(?:[235]|4[1-35-9])|52']),
         NumberFormat(pattern='(\\d{3})(\\d{5})', format='\\1 \\2', leading_digits_pattern=['[245]'])],
diff --git a/python/phonenumbers/data/region_LI.py b/python/phonenumbers/data/region_LI.py
index 855b6abd..36f4091c 100644
--- a/python/phonenumbers/data/region_LI.py
+++ b/python/phonenumbers/data/region_LI.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_LI = PhoneMetadata(id='LI', country_code=423, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[68]\\d{8}|(?:[2378]\\d|90)\\d{5}', possible_length=(7, 9)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:01|1[27]|2[02]|3\\d|6[02-578]|96)|3(?:[24]0|33|7[0135-7]|8[048]|9[0269]))\\d{4}', example_number='2345678', possible_length=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[0245]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}', example_number='660234567', possible_length=(7, 9)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[024-6]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}', example_number='660234567', possible_length=(7, 9)),
     toll_free=PhoneNumberDesc(national_number_pattern='8002[28]\\d\\d|80(?:05\\d|9)\\d{4}', example_number='8002222', possible_length=(7, 9)),
     premium_rate=PhoneNumberDesc(national_number_pattern='90(?:02[258]|1(?:23|3[14])|66[136])\\d\\d', example_number='9002222', possible_length=(7,)),
     uan=PhoneNumberDesc(national_number_pattern='870(?:28|87)\\d\\d', example_number='8702812', possible_length=(7,)),
diff --git a/python/phonenumbers/data/region_MF.py b/python/phonenumbers/data/region_MF.py
index f6841fcd..3aada276 100644
--- a/python/phonenumbers/data/region_MF.py
+++ b/python/phonenumbers/data/region_MF.py
@@ -4,9 +4,9 @@
 PHONE_METADATA_MF = PhoneMetadata(id='MF', country_code=590, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='590\\d{6}|(?:69|80|9\\d)\\d{7}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='590(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)\\d{4}', example_number='590271234', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}', example_number='690001234', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}', example_number='690001234', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80[0-5]\\d{6}', example_number='800012345', possible_length=(9,)),
-    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:395|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
+    voip=PhoneNumberDesc(national_number_pattern='9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}', example_number='976012345', possible_length=(9,)),
     national_prefix='0',
     national_prefix_for_parsing='0',
     mobile_number_portable_region=True)
diff --git a/python/phonenumbers/data/region_MX.py b/python/phonenumbers/data/region_MX.py
index 644ac103..6f8a52a2 100644
--- a/python/phonenumbers/data/region_MX.py
+++ b/python/phonenumbers/data/region_MX.py
@@ -2,9 +2,9 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_MX = PhoneMetadata(id='MX', country_code=52, international_prefix='0[09]',
-    general_desc=PhoneNumberDesc(national_number_pattern='1(?:(?:[27]2|44|87|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-9]|8[1-69]|9[1-8])|[2-9]\\d)\\d{8}', possible_length=(10, 11), possible_length_local_only=(7, 8)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}', example_number='2001234567', possible_length=(10,), possible_length_local_only=(7, 8)),
-    mobile=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}', example_number='12221234567', possible_length=(10, 11), possible_length_local_only=(7, 8)),
+    general_desc=PhoneNumberDesc(national_number_pattern='1(?:(?:22|44|7[27]|87|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-8])|[2-9]\\d)\\d{8}', possible_length=(10, 11), possible_length_local_only=(7, 8)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}', example_number='2001234567', possible_length=(10,), possible_length_local_only=(7, 8)),
+    mobile=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}', example_number='12221234567', possible_length=(10, 11), possible_length_local_only=(7, 8)),
     toll_free=PhoneNumberDesc(national_number_pattern='8(?:00|88)\\d{7}', example_number='8001234567', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{7}', example_number='9001234567', possible_length=(10,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='300\\d{7}', example_number='3001234567', possible_length=(10,)),
diff --git a/python/phonenumbers/data/region_OM.py b/python/phonenumbers/data/region_OM.py
index fc51336c..3918c70f 100644
--- a/python/phonenumbers/data/region_OM.py
+++ b/python/phonenumbers/data/region_OM.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_OM = PhoneMetadata(id='OM', country_code=968, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}', possible_length=(7, 8, 9)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2[1-6]\\d{6}', example_number='23123456', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|6[89]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|6[7-9]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='8007\\d{4,5}|(?:500|800[05])\\d{4}', example_number='80071234', possible_length=(7, 8, 9)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{5}', example_number='90012345', possible_length=(8,)),
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{4,6})', format='\\1 \\2', leading_digits_pattern=['[58]']),
diff --git a/python/phonenumbers/data/region_PL.py b/python/phonenumbers/data/region_PL.py
index ea9d5d7d..1acb70db 100644
--- a/python/phonenumbers/data/region_PL.py
+++ b/python/phonenumbers/data/region_PL.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_PL = PhoneMetadata(id='PL', country_code=48, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:6|8\\d\\d)\\d{7}|[1-9]\\d{6}(?:\\d{2})?|[26]\\d{5}', possible_length=(6, 7, 8, 9, 10)),
     fixed_line=PhoneNumberDesc(national_number_pattern='47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))', example_number='123456789', possible_length=(7, 9)),
-    mobile=PhoneNumberDesc(national_number_pattern='21(?:1(?:[145]\\d|3[1-5])|2\\d\\d)\\d{4}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}', example_number='512345678', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='21(?:1[013-5]|2\\d)\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}', example_number='512345678', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6,7}', example_number='800123456', possible_length=(9, 10)),
     premium_rate=PhoneNumberDesc(national_number_pattern='70[01346-8]\\d{6}', example_number='701234567', possible_length=(9,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='801\\d{6}', example_number='801234567', possible_length=(9,)),
diff --git a/python/phonenumbers/data/region_PT.py b/python/phonenumbers/data/region_PT.py
index d79a6e4a..3620615d 100644
--- a/python/phonenumbers/data/region_PT.py
+++ b/python/phonenumbers/data/region_PT.py
@@ -4,15 +4,15 @@
 PHONE_METADATA_PT = PhoneMetadata(id='PT', country_code=351, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='1693\\d{5}|(?:[26-9]\\d|30)\\d{7}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2(?:[12]\\d|3[1-689]|4[1-59]|[57][1-9]|6[1-35689]|8[1-69]|9[1256])\\d{6}', example_number='212345678', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='6(?:[06]92(?:30|9\\d)|[35]92(?:3[03]|9\\d))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}', example_number='912345678', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='6(?:[06]92(?:30|9\\d)|[35]92(?:3[034]|9\\d))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}', example_number='912345678', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80[02]\\d{6}', example_number='800123456', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='(?:6(?:0[178]|4[68])\\d|76(?:0[1-57]|1[2-47]|2[237]))\\d{5}', example_number='760123456', possible_length=(9,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='80(?:8\\d|9[1579])\\d{5}', example_number='808123456', possible_length=(9,)),
     personal_number=PhoneNumberDesc(national_number_pattern='884[0-4689]\\d{5}', example_number='884123456', possible_length=(9,)),
     voip=PhoneNumberDesc(national_number_pattern='30\\d{7}', example_number='301234567', possible_length=(9,)),
-    pager=PhoneNumberDesc(national_number_pattern='6222\\d{5}', example_number='622212345', possible_length=(9,)),
+    pager=PhoneNumberDesc(national_number_pattern='6(?:222\\d|8988)\\d{4}', example_number='622212345', possible_length=(9,)),
     uan=PhoneNumberDesc(national_number_pattern='70(?:38[01]|596|(?:7\\d|8[17])\\d)\\d{4}', example_number='707123456', possible_length=(9,)),
-    voicemail=PhoneNumberDesc(national_number_pattern='600\\d{6}|6[06]9233\\d{3}', example_number='600110000', possible_length=(9,)),
+    voicemail=PhoneNumberDesc(national_number_pattern='600\\d{6}|6[06]923[34]\\d{3}', example_number='600110000', possible_length=(9,)),
     number_format=[NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['2[12]']),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['16|[236-9]'])],
     mobile_number_portable_region=True)
diff --git a/python/phonenumbers/data/region_SV.py b/python/phonenumbers/data/region_SV.py
index 872dfd23..1268d899 100644
--- a/python/phonenumbers/data/region_SV.py
+++ b/python/phonenumbers/data/region_SV.py
@@ -2,10 +2,10 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_SV = PhoneMetadata(id='SV', country_code=503, international_prefix='00',
-    general_desc=PhoneNumberDesc(national_number_pattern='[267]\\d{7}|[89]00\\d{4}(?:\\d{4})?', possible_length=(7, 8, 11)),
+    general_desc=PhoneNumberDesc(national_number_pattern='[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?', possible_length=(7, 8, 11)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2(?:79(?:0[0347-9]|[1-9]\\d)|89(?:0[024589]|[1-9]\\d))\\d{3}|2(?:[1-69]\\d|[78][0-8])\\d{5}', example_number='21234567', possible_length=(8,)),
     mobile=PhoneNumberDesc(national_number_pattern='[67]\\d{7}', example_number='70123456', possible_length=(8,)),
-    toll_free=PhoneNumberDesc(national_number_pattern='800\\d{4}(?:\\d{4})?', example_number='8001234', possible_length=(7, 11)),
+    toll_free=PhoneNumberDesc(national_number_pattern='800\\d{8}|80[01]\\d{4}', example_number='8001234', possible_length=(7, 11)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{4}(?:\\d{4})?', example_number='9001234', possible_length=(7, 11)),
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[89]']),
         NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[267]']),
diff --git a/python/phonenumbers/data/region_UG.py b/python/phonenumbers/data/region_UG.py
index 627ff8d0..3e01978b 100644
--- a/python/phonenumbers/data/region_UG.py
+++ b/python/phonenumbers/data/region_UG.py
@@ -3,8 +3,8 @@
 
 PHONE_METADATA_UG = PhoneMetadata(id='UG', country_code=256, international_prefix='00[057]',
     general_desc=PhoneNumberDesc(national_number_pattern='800\\d{6}|(?:[29]0|[347]\\d)\\d{7}', possible_length=(9,), possible_length_local_only=(5, 6, 7)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|32|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', example_number='312345678', possible_length=(9,), possible_length_local_only=(5, 6, 7)),
-    mobile=PhoneNumberDesc(national_number_pattern='726[01]\\d{5}|7(?:[015-8]\\d|20|36|4[0-4]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', example_number='312345678', possible_length=(9,), possible_length_local_only=(5, 6, 7)),
+    mobile=PhoneNumberDesc(national_number_pattern='72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-4]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800[1-3]\\d{5}', example_number='800123456', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='90[1-3]\\d{6}', example_number='901123456', possible_length=(9,)),
     national_prefix='0',
diff --git a/python/phonenumbers/data/region_US.py b/python/phonenumbers/data/region_US.py
index 5ee32d82..362ed86d 100644
--- a/python/phonenumbers/data/region_US.py
+++ b/python/phonenumbers/data/region_US.py
@@ -3,8 +3,8 @@
 
 PHONE_METADATA_US = PhoneMetadata(id='US', country_code=1, international_prefix='011',
     general_desc=PhoneNumberDesc(national_number_pattern='[2-9]\\d{9}|3\\d{6}', possible_length=(10,), possible_length_local_only=(7,)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|7302[01]\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|7302[01]\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)),
     toll_free=PhoneNumberDesc(national_number_pattern='8(?:00|33|44|55|66|77|88)[2-9]\\d{6}', example_number='8002345678', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900[2-9]\\d{6}', example_number='9002345678', possible_length=(10,)),
     personal_number=PhoneNumberDesc(national_number_pattern='52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}', example_number='5002345678', possible_length=(10,)),
diff --git a/python/phonenumbers/geodata/data0.py b/python/phonenumbers/geodata/data0.py
index 94ac9468..d8c5a2c3 100644
--- a/python/phonenumbers/geodata/data0.py
+++ b/python/phonenumbers/geodata/data0.py
@@ -8106,6 +8106,7 @@
  '1361992':{'en': 'Corpus Christi, TX'},
  '1361993':{'en': 'Corpus Christi, TX'},
  '1361994':{'en': 'Corpus Christi, TX'},
+ '1363':{'en': 'New York'},
  '1364':{'en': 'Kentucky'},
  '1365':{'en': 'Ontario'},
  '1367':{'en': 'Quebec'},
@@ -10018,5 +10019,4 @@
  '1414933':{'en': 'Milwaukee, WI'},
  '1414961':{'en': 'Milwaukee, WI'},
  '1414962':{'en': 'Milwaukee, WI'},
- '1414963':{'en': 'Milwaukee, WI'},
 }
diff --git a/python/phonenumbers/geodata/data1.py b/python/phonenumbers/geodata/data1.py
index 2bd8ff1f..cc1533f7 100644
--- a/python/phonenumbers/geodata/data1.py
+++ b/python/phonenumbers/geodata/data1.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '1414963':{'en': 'Milwaukee, WI'},
  '1414964':{'en': 'Milwaukee, WI'},
  '1414967':{'en': 'Milwaukee, WI'},
  '1414988':{'en': 'Milwaukee, WI'},
@@ -10018,5 +10019,4 @@
  '1705528':{'en': 'Midland, ON'},
  '1705534':{'en': 'Port McNicoll, ON'},
  '1705538':{'en': 'Waubaushene, ON'},
- '1705544':{'en': 'Englehart, ON'},
 }
diff --git a/python/phonenumbers/geodata/data10.py b/python/phonenumbers/geodata/data10.py
index 109b6afe..4d5ec6af 100644
--- a/python/phonenumbers/geodata/data10.py
+++ b/python/phonenumbers/geodata/data10.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '61350401':{'en': 'Curyo'},
+ '61350402':{'en': 'Hopetoun'},
  '61350403':{'en': 'Patchewollock'},
  '61350404':{'en': 'Turriff'},
  '61350405':{'en': 'Woomelang'},
@@ -10017,6 +10019,4 @@
  '61728023':{'en': 'Ipswich'},
  '6172889':{'en': 'Beenleigh'},
  '6172891':{'en': 'Beenleigh'},
- '6173018':{'en': 'Brisbane'},
- '6173019':{'en': 'Brisbane'},
 }
diff --git a/python/phonenumbers/geodata/data11.py b/python/phonenumbers/geodata/data11.py
index 1c90c147..30ef7620 100644
--- a/python/phonenumbers/geodata/data11.py
+++ b/python/phonenumbers/geodata/data11.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '6173018':{'en': 'Brisbane'},
+ '6173019':{'en': 'Brisbane'},
  '617303':{'en': 'Brisbane'},
  '61730380':{'en': 'Samford'},
  '61730381':{'en': 'Cleveland'},
@@ -10017,6 +10019,4 @@
  '6175294':{'en': 'Nambour'},
  '61752947':{'en': 'Caboolture'},
  '61752948':{'en': 'Caboolture'},
- '61752949':{'en': 'Caboolture'},
- '61753000':{'en': 'Rosevale'},
 }
diff --git a/python/phonenumbers/geodata/data12.py b/python/phonenumbers/geodata/data12.py
index e3870e5d..3bce84b9 100644
--- a/python/phonenumbers/geodata/data12.py
+++ b/python/phonenumbers/geodata/data12.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '61752949':{'en': 'Caboolture'},
+ '61753000':{'en': 'Rosevale'},
  '61753001':{'en': 'Rosewood'},
  '61753002':{'en': 'Thornton'},
  '61753003':{'en': 'Woodbine'},
@@ -10017,6 +10019,4 @@
  '61885893':{'en': 'Lowbank'},
  '61885894':{'en': 'Lowbank'},
  '61885895':{'en': 'Yankalilla'},
- '61885897':{'en': 'Mantung'},
- '61885898':{'en': 'Mantung'},
 }
diff --git a/python/phonenumbers/geodata/data13.py b/python/phonenumbers/geodata/data13.py
index d3678b3e..e50d645f 100644
--- a/python/phonenumbers/geodata/data13.py
+++ b/python/phonenumbers/geodata/data13.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '61885897':{'en': 'Mantung'},
+ '61885898':{'en': 'Mantung'},
  '61885899':{'en': 'Willunga'},
  '61885900':{'en': 'Freeling'},
  '61885901':{'en': 'Gawler'},
@@ -10017,6 +10019,4 @@
  '61899378':{'en': 'Morawa'},
  '61899379':{'en': 'Geraldton'},
  '6189938':{'en': 'Geraldton'},
- '61899385':{'en': 'Northampton'},
- '61899386':{'en': 'Northampton'},
 }
diff --git a/python/phonenumbers/geodata/data14.py b/python/phonenumbers/geodata/data14.py
index 496c0846..875d16bf 100644
--- a/python/phonenumbers/geodata/data14.py
+++ b/python/phonenumbers/geodata/data14.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '61899385':{'en': 'Northampton'},
+ '61899386':{'en': 'Northampton'},
  '61899387':{'en': 'Northern Gully'},
  '61899388':{'en': 'Northern Gully'},
  '61899390':{'en': 'Mingenew'},
@@ -10017,6 +10019,4 @@
  '861308396':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
  '861308397':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
  '861308398':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
- '861308399':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
- '861308400':{'en': 'Suzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5bbf\u5dde\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data15.py b/python/phonenumbers/geodata/data15.py
index dbc8d22c..86f27b06 100644
--- a/python/phonenumbers/geodata/data15.py
+++ b/python/phonenumbers/geodata/data15.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861308399':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
+ '861308400':{'en': 'Suzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5bbf\u5dde\u5e02')},
  '861308401':{'en': 'Suzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5bbf\u5dde\u5e02')},
  '861308402':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
  '861308403':{'en': 'LuAn, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u516d\u5b89\u5e02')},
@@ -10017,6 +10019,4 @@
  '861324911':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')},
  '861324912':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')},
  '86132492':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
- '861324930':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
- '861324931':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data16.py b/python/phonenumbers/geodata/data16.py
index 869cb15b..7741d6ef 100644
--- a/python/phonenumbers/geodata/data16.py
+++ b/python/phonenumbers/geodata/data16.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861324930':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
+ '861324931':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
  '861324932':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
  '861324933':{'en': 'Shijiazhuang, Hebei', 'zh': u('\u6cb3\u5317\u7701\u77f3\u5bb6\u5e84\u5e02')},
  '861324934':{'en': 'Shijiazhuang, Hebei', 'zh': u('\u6cb3\u5317\u7701\u77f3\u5bb6\u5e84\u5e02')},
@@ -10017,6 +10019,4 @@
  '861341348':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')},
  '861341349':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')},
  '86134135':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')},
- '86134136':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
- '86134137':{'en': 'Chaozhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6f6e\u5dde\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data17.py b/python/phonenumbers/geodata/data17.py
index ced6a178..c4585a3b 100644
--- a/python/phonenumbers/geodata/data17.py
+++ b/python/phonenumbers/geodata/data17.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '86134136':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
+ '86134137':{'en': 'Chaozhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6f6e\u5dde\u5e02')},
  '86134138':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')},
  '86134139':{'en': 'Jieyang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u63ed\u9633\u5e02')},
  '86134140':{'en': 'Shantou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c55\u5934\u5e02')},
@@ -10017,6 +10019,4 @@
  '861365955':{'en': 'Qamdo, Tibet', 'zh': u('\u897f\u85cf\u660c\u90fd\u5730\u533a')},
  '861365956':{'en': 'Xigaze, Tibet', 'zh': u('\u897f\u85cf\u65e5\u5580\u5219\u5730\u533a')},
  '861365957':{'en': 'Xigaze, Tibet', 'zh': u('\u897f\u85cf\u65e5\u5580\u5219\u5730\u533a')},
- '861365958':{'en': 'Shannan, Tibet', 'zh': u('\u897f\u85cf\u5c71\u5357\u5730\u533a')},
- '861365959':{'en': 'Nyingchi, Tibet', 'zh': u('\u897f\u85cf\u6797\u829d\u5730\u533a')},
 }
diff --git a/python/phonenumbers/geodata/data18.py b/python/phonenumbers/geodata/data18.py
index 1489ea37..b8fc58dd 100644
--- a/python/phonenumbers/geodata/data18.py
+++ b/python/phonenumbers/geodata/data18.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861365958':{'en': 'Shannan, Tibet', 'zh': u('\u897f\u85cf\u5c71\u5357\u5730\u533a')},
+ '861365959':{'en': 'Nyingchi, Tibet', 'zh': u('\u897f\u85cf\u6797\u829d\u5730\u533a')},
  '861365960':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
  '861365961':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
  '861365962':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
@@ -10017,6 +10019,4 @@
  '861396668':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
  '861396669':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
  '86139667':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861396680':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
- '861396681':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data19.py b/python/phonenumbers/geodata/data19.py
index 967b9192..2a73c84c 100644
--- a/python/phonenumbers/geodata/data19.py
+++ b/python/phonenumbers/geodata/data19.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861396680':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
+ '861396681':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
  '861396682':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
  '861396683':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
  '861396684':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')},
@@ -10017,6 +10019,4 @@
  '861508231':{'en': 'Garze, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7518\u5b5c\u85cf\u65cf\u81ea\u6cbb\u5dde')},
  '861508232':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
  '861508233':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
- '861508234':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
- '861508235':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data2.py b/python/phonenumbers/geodata/data2.py
index 70ee68cb..fcc3081f 100644
--- a/python/phonenumbers/geodata/data2.py
+++ b/python/phonenumbers/geodata/data2.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '1705544':{'en': 'Englehart, ON'},
  '1705549':{'en': 'Penetanguishene, ON'},
  '1705560':{'en': 'Greater Sudbury, ON'},
  '1705563':{'en': 'Earlton, ON'},
@@ -10018,5 +10019,4 @@
  '1919':{'en': 'North Carolina'},
  '1919207':{'en': 'Benson, NC'},
  '1919209':{'en': 'Smithfield, NC'},
- '1919212':{'en': 'Raleigh, NC'},
 }
diff --git a/python/phonenumbers/geodata/data20.py b/python/phonenumbers/geodata/data20.py
index 990a768b..ffa2b48d 100644
--- a/python/phonenumbers/geodata/data20.py
+++ b/python/phonenumbers/geodata/data20.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861508234':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
+ '861508235':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')},
  '861508236':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')},
  '861508237':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')},
  '861508238':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')},
@@ -10017,6 +10019,4 @@
  '861534529':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')},
  '861534530':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')},
  '861534531':{'en': 'Jinan, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5357\u5e02')},
- '861534532':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
- '861534533':{'en': 'Zibo, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6dc4\u535a\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data21.py b/python/phonenumbers/geodata/data21.py
index 463e6592..05a0e305 100644
--- a/python/phonenumbers/geodata/data21.py
+++ b/python/phonenumbers/geodata/data21.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861534532':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
+ '861534533':{'en': 'Zibo, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6dc4\u535a\u5e02')},
  '861534534':{'en': 'Dezhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5fb7\u5dde\u5e02')},
  '861534535':{'en': 'Yantai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u70df\u53f0\u5e02')},
  '861534536':{'en': 'Weifang, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6f4d\u574a\u5e02')},
@@ -10017,6 +10019,4 @@
  '861568546':{'en': 'Tongren, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u94dc\u4ec1\u5730\u533a')},
  '861568547':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')},
  '861568548':{'en': 'Liupanshui, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u516d\u76d8\u6c34\u5e02')},
- '861568549':{'en': 'Qianxinan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u897f\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
- '86156855':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')},
 }
diff --git a/python/phonenumbers/geodata/data22.py b/python/phonenumbers/geodata/data22.py
index b270d27f..b766fb34 100644
--- a/python/phonenumbers/geodata/data22.py
+++ b/python/phonenumbers/geodata/data22.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861568549':{'en': 'Qianxinan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u897f\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
+ '86156855':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')},
  '861568550':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
  '861568551':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
  '861568552':{'en': 'Zunyi, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9075\u4e49\u5e02')},
@@ -10017,6 +10019,4 @@
  '861596049':{'en': 'Ningde, Fujian', 'zh': u('\u798f\u5efa\u7701\u5b81\u5fb7\u5e02')},
  '861596050':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
  '861596051':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
- '861596052':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
- '861596053':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data23.py b/python/phonenumbers/geodata/data23.py
index cb305122..02737dae 100644
--- a/python/phonenumbers/geodata/data23.py
+++ b/python/phonenumbers/geodata/data23.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861596052':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
+ '861596053':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
  '861596054':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')},
  '861596055':{'en': 'Quanzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6cc9\u5dde\u5e02')},
  '861596056':{'en': 'Quanzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6cc9\u5dde\u5e02')},
@@ -10017,6 +10019,4 @@
  '861787773':{'en': 'Huaihua, Hunan', 'zh': u('\u6e56\u5357\u7701\u6000\u5316\u5e02')},
  '861787774':{'en': 'Shaoyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u90b5\u9633\u5e02')},
  '861787775':{'en': 'Yongzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u6c38\u5dde\u5e02')},
- '861787776':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')},
- '861787777':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
 }
diff --git a/python/phonenumbers/geodata/data24.py b/python/phonenumbers/geodata/data24.py
index badb2db0..ec83a823 100644
--- a/python/phonenumbers/geodata/data24.py
+++ b/python/phonenumbers/geodata/data24.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861787776':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')},
+ '861787777':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
  '861787778':{'en': 'Changsha, Hunan', 'zh': u('\u6e56\u5357\u7701\u957f\u6c99\u5e02')},
  '861787779':{'en': 'Changsha, Hunan', 'zh': u('\u6e56\u5357\u7701\u957f\u6c99\u5e02')},
  '86178780':{'en': 'Yulin, Guangxi', 'zh': u('\u5e7f\u897f\u7389\u6797\u5e02')},
@@ -10017,6 +10019,4 @@
  '861820960':{'en': 'Yinchuan, Ningxia', 'zh': u('\u5b81\u590f\u94f6\u5ddd\u5e02')},
  '861820961':{'en': 'Yinchuan, Ningxia', 'zh': u('\u5b81\u590f\u94f6\u5ddd\u5e02')},
  '861820962':{'en': 'Shizuishan, Ningxia', 'zh': u('\u5b81\u590f\u77f3\u5634\u5c71\u5e02')},
- '861820963':{'en': 'Wuzhong, Ningxia', 'zh': u('\u5b81\u590f\u5434\u5fe0\u5e02')},
- '861820964':{'en': 'Guyuan, Ningxia', 'zh': u('\u5b81\u590f\u56fa\u539f\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data25.py b/python/phonenumbers/geodata/data25.py
index 3391f163..0256a43c 100644
--- a/python/phonenumbers/geodata/data25.py
+++ b/python/phonenumbers/geodata/data25.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861820963':{'en': 'Wuzhong, Ningxia', 'zh': u('\u5b81\u590f\u5434\u5fe0\u5e02')},
+ '861820964':{'en': 'Guyuan, Ningxia', 'zh': u('\u5b81\u590f\u56fa\u539f\u5e02')},
  '861820965':{'en': 'Zhongwei, Ningxia', 'zh': u('\u5b81\u590f\u4e2d\u536b\u5e02')},
  '861820966':{'en': 'Wuzhong, Ningxia', 'zh': u('\u5b81\u590f\u5434\u5fe0\u5e02')},
  '861820967':{'en': 'Yinchuan, Ningxia', 'zh': u('\u5b81\u590f\u94f6\u5ddd\u5e02')},
@@ -10017,6 +10019,4 @@
  '861856900':{'en': 'Zhuzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u682a\u6d32\u5e02')},
  '861856901':{'en': 'Zhuzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u682a\u6d32\u5e02')},
  '861856902':{'en': 'Hengyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u8861\u9633\u5e02')},
- '861856909':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
- '86185691':{'en': 'Changde, Hunan', 'zh': u('\u6e56\u5357\u7701\u5e38\u5fb7\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data26.py b/python/phonenumbers/geodata/data26.py
index 991fa3ec..22750821 100644
--- a/python/phonenumbers/geodata/data26.py
+++ b/python/phonenumbers/geodata/data26.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861856909':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
+ '86185691':{'en': 'Changde, Hunan', 'zh': u('\u6e56\u5357\u7701\u5e38\u5fb7\u5e02')},
  '861856919':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')},
  '861856920':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')},
  '861856921':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')},
@@ -10017,6 +10019,4 @@
  '861883846':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
  '861883847':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
  '861883848':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
- '861883849':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
- '86188385':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data27.py b/python/phonenumbers/geodata/data27.py
index 012d443a..bc4cd07c 100644
--- a/python/phonenumbers/geodata/data27.py
+++ b/python/phonenumbers/geodata/data27.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '861883849':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
+ '86188385':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
  '861883856':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
  '861883857':{'en': 'Shangqiu, Henan', 'zh': u('\u6cb3\u5357\u7701\u5546\u4e18\u5e02')},
  '861883858':{'en': 'Shangqiu, Henan', 'zh': u('\u6cb3\u5357\u7701\u5546\u4e18\u5e02')},
@@ -10017,6 +10019,4 @@
  '9171832':{'en': 'Tumsar, Maharashtra'},
  '9171833':{'en': 'Tumsar, Maharashtra'},
  '9171834':{'en': 'Tumsar, Maharashtra'},
- '9171835':{'en': 'Tumsar, Maharashtra'},
- '9171836':{'en': 'Tumsar, Maharashtra'},
 }
diff --git a/python/phonenumbers/geodata/data28.py b/python/phonenumbers/geodata/data28.py
index 3806264f..714efcd3 100644
--- a/python/phonenumbers/geodata/data28.py
+++ b/python/phonenumbers/geodata/data28.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '9171835':{'en': 'Tumsar, Maharashtra'},
+ '9171836':{'en': 'Tumsar, Maharashtra'},
  '9171837':{'en': 'Tumsar, Maharashtra'},
  '9171842':{'en': 'Bhandara, Maharashtra'},
  '9171843':{'en': 'Bhandara, Maharashtra'},
diff --git a/python/phonenumbers/geodata/data3.py b/python/phonenumbers/geodata/data3.py
index 84bbf1f5..8391be1d 100644
--- a/python/phonenumbers/geodata/data3.py
+++ b/python/phonenumbers/geodata/data3.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '1919212':{'en': 'Raleigh, NC'},
  '1919217':{'en': 'Knightdale, NC'},
  '1919220':{'en': 'Durham, NC'},
  '1919231':{'en': 'Raleigh, NC'},
@@ -10018,5 +10019,4 @@
  '3323561':{'en': 'Bois-Guillaume', 'fr': 'Bois-Guillaume'},
  '3323562':{'en': 'Rouen', 'fr': 'Rouen'},
  '3323563':{'en': 'Rouen', 'fr': 'Rouen'},
- '3323564':{'en': 'Oissel', 'fr': 'Oissel'},
 }
diff --git a/python/phonenumbers/geodata/data4.py b/python/phonenumbers/geodata/data4.py
index ec6792ae..3cc9be9e 100644
--- a/python/phonenumbers/geodata/data4.py
+++ b/python/phonenumbers/geodata/data4.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '3323564':{'en': 'Oissel', 'fr': 'Oissel'},
  '3323565':{'en': u('Saint-\u00c9tienne-du-Rouvray'), 'fr': u('Saint-\u00c9tienne-du-Rouvray')},
  '3323566':{'en': u('Saint-\u00c9tienne-du-Rouvray'), 'fr': u('Saint-\u00c9tienne-du-Rouvray')},
  '3323567':{'en': 'Grand-Couronne', 'fr': 'Grand-Couronne'},
@@ -10018,5 +10019,4 @@
  '3358667':{'en': 'Barbezieux-Saint-Hilaire', 'fr': 'Barbezieux-Saint-Hilaire'},
  '3358668':{'en': 'Confolens', 'fr': 'Confolens'},
  '3358669':{'en': 'Jonzac', 'fr': 'Jonzac'},
- '3358670':{'en': 'Loudun', 'fr': 'Loudun'},
 }
diff --git a/python/phonenumbers/geodata/data5.py b/python/phonenumbers/geodata/data5.py
index 050f1509..a531de3d 100644
--- a/python/phonenumbers/geodata/data5.py
+++ b/python/phonenumbers/geodata/data5.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '3358670':{'en': 'Loudun', 'fr': 'Loudun'},
  '3358671':{'en': 'Montmorillon', 'fr': 'Montmorillon'},
  '3358672':{'en': 'Melle', 'fr': 'Melle'},
  '3358673':{'en': 'Saint-Jean-dAngely', 'fr': 'Saint-Jean-dAngely'},
@@ -10018,5 +10019,4 @@
  '494762':{'de': 'Kutenholz', 'en': 'Kutenholz'},
  '494763':{'de': 'Gnarrenburg', 'en': 'Gnarrenburg'},
  '494764':{'de': 'Gnarrenburg-Klenkendorf', 'en': 'Gnarrenburg-Klenkendorf'},
- '494765':{'de': u('Ebersdorf bei Bremerv\u00f6rde'), 'en': u('Ebersdorf bei Bremerv\u00f6rde')},
 }
diff --git a/python/phonenumbers/geodata/data6.py b/python/phonenumbers/geodata/data6.py
index 65227829..ea36c8bb 100644
--- a/python/phonenumbers/geodata/data6.py
+++ b/python/phonenumbers/geodata/data6.py
@@ -19,6 +19,7 @@
 # limitations under the License.
 
 data = {
+ '494765':{'de': u('Ebersdorf bei Bremerv\u00f6rde'), 'en': u('Ebersdorf bei Bremerv\u00f6rde')},
  '494766':{'de': 'Basdahl', 'en': 'Basdahl'},
  '494767':{'de': u('Bremerv\u00f6rde-Bevern'), 'en': u('Bremerv\u00f6rde-Bevern')},
  '494768':{'de': 'Hipstedt', 'en': 'Hipstedt'},
@@ -3299,6 +3300,7 @@
  '52767':{'en': 'Guerrero', 'es': 'Guerrero'},
  '52768':{'en': 'Veracruz', 'es': 'Veracruz'},
  '52769':{'en': 'Morelos', 'es': 'Morelos'},
+ '52770':{'en': 'Cuernavaca/Emiliano Zapata/Temixco/Xochitepec/Jiutepec', 'es': 'Cuernavaca/Emiliano Zapata/Temixco/Xochitepec/Jiutepec'},
  '52771':{'en': 'Pachuca/Real Del Monte, HGO', 'es': 'Pachuca/Real del Monte, HGO'},
  '52772':{'en': 'Actopan, HGO', 'es': 'Actopan, HGO'},
  '52773':{'en': 'Hidalgo', 'es': 'Hidalgo'},
@@ -10017,6 +10019,4 @@
  '55493336':{'en': u('Guatamb\u00fa - SC'), 'pt': u('Guatamb\u00fa - SC')},
  '55493337':{'en': u('Jardin\u00f3polis - SC'), 'pt': u('Jardin\u00f3polis - SC')},
  '55493338':{'en': u('Cunhata\u00ed - SC'), 'pt': u('Cunhata\u00ed - SC')},
- '55493339':{'en': u('\u00c1guas de Chapec\u00f3 - SC'), 'pt': u('\u00c1guas de Chapec\u00f3 - SC')},
- '55493341':{'en': u('Jupi\u00e1 - SC'), 'pt': u('Jupi\u00e1 - SC')},
 }
diff --git a/python/phonenumbers/geodata/data7.py b/python/phonenumbers/geodata/data7.py
index 64fd8cd6..8ae2ebac 100644
--- a/python/phonenumbers/geodata/data7.py
+++ b/python/phonenumbers/geodata/data7.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '55493339':{'en': u('\u00c1guas de Chapec\u00f3 - SC'), 'pt': u('\u00c1guas de Chapec\u00f3 - SC')},
+ '55493341':{'en': u('Jupi\u00e1 - SC'), 'pt': u('Jupi\u00e1 - SC')},
  '55493342':{'en': u('Galv\u00e3o - SC'), 'pt': u('Galv\u00e3o - SC')},
  '55493343':{'en': 'Formosa do Sul - SC', 'pt': 'Formosa do Sul - SC'},
  '55493344':{'en': u('S\u00e3o Louren\u00e7o do Oeste - SC'), 'pt': u('S\u00e3o Louren\u00e7o do Oeste - SC')},
@@ -10017,6 +10019,4 @@
  '609686':{'en': 'Kuala Brang'},
  '609687':{'en': 'Bukit Bading'},
  '609688':{'en': 'Kuala Brang'},
- '60969':{'en': 'Jerteh'},
- '609700':{'en': 'Kota Bharu'},
 }
diff --git a/python/phonenumbers/geodata/data8.py b/python/phonenumbers/geodata/data8.py
index 7f50bdf8..6a728459 100644
--- a/python/phonenumbers/geodata/data8.py
+++ b/python/phonenumbers/geodata/data8.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '60969':{'en': 'Jerteh'},
+ '609700':{'en': 'Kota Bharu'},
  '609701':{'en': 'Kota Bharu'},
  '609703':{'en': 'Kota Bharu'},
  '609706':{'en': 'Kota Bharu'},
@@ -10017,6 +10019,4 @@
  '61263800':{'en': 'Murringo'},
  '61263801':{'en': 'Young'},
  '61263802':{'en': 'Boorowa'},
- '61263803':{'en': 'Bribbaree'},
- '61263804':{'en': 'Frogmore'},
 }
diff --git a/python/phonenumbers/geodata/data9.py b/python/phonenumbers/geodata/data9.py
index 781215b4..75893896 100644
--- a/python/phonenumbers/geodata/data9.py
+++ b/python/phonenumbers/geodata/data9.py
@@ -19,6 +19,8 @@
 # limitations under the License.
 
 data = {
+ '61263803':{'en': 'Bribbaree'},
+ '61263804':{'en': 'Frogmore'},
  '61263805':{'en': 'Galong'},
  '61263806':{'en': 'Harden'},
  '61263807':{'en': 'Maimuru'},
@@ -10017,6 +10019,4 @@
  '61350398':{'en': 'Ultima'},
  '61350399':{'en': 'Ultima'},
  '61350400':{'en': 'Annuello'},
- '61350401':{'en': 'Curyo'},
- '61350402':{'en': 'Hopetoun'},
 }
diff --git a/python/phonenumbers/tzdata/data0.py b/python/phonenumbers/tzdata/data0.py
index 97d00d7f..4f20dc12 100644
--- a/python/phonenumbers/tzdata/data0.py
+++ b/python/phonenumbers/tzdata/data0.py
@@ -715,6 +715,7 @@
  '1354':('America/Toronto',),
  '1360':('America/Los_Angeles',),
  '1361':('America/Chicago',),
+ '1363':('America/New_York',),
  '1364':('America/New_York',),
  '1365':('America/Toronto',),
  '1367':('America/Toronto',),