Merge branch 'dev' into python3

Conflicts:
	python/phonenumbers/data/region_AL.py
	python/phonenumbers/data/region_AR.py
	python/phonenumbers/data/region_AT.py
	python/phonenumbers/data/region_AU.py
	python/phonenumbers/data/region_AZ.py
	python/phonenumbers/data/region_BA.py
	python/phonenumbers/data/region_BE.py
	python/phonenumbers/data/region_BG.py
	python/phonenumbers/data/region_BH.py
	python/phonenumbers/data/region_BR.py
	python/phonenumbers/data/region_BY.py
	python/phonenumbers/data/region_CH.py
	python/phonenumbers/data/region_CL.py
	python/phonenumbers/data/region_CN.py
	python/phonenumbers/data/region_CO.py
	python/phonenumbers/data/region_CY.py
	python/phonenumbers/data/region_CZ.py
	python/phonenumbers/data/region_DE.py
	python/phonenumbers/data/region_DK.py
	python/phonenumbers/data/region_EC.py
	python/phonenumbers/data/region_EE.py
	python/phonenumbers/data/region_EG.py
	python/phonenumbers/data/region_ES.py
	python/phonenumbers/data/region_FI.py
	python/phonenumbers/data/region_FR.py
	python/phonenumbers/data/region_GB.py
	python/phonenumbers/data/region_GE.py
	python/phonenumbers/data/region_GH.py
	python/phonenumbers/data/region_GR.py
	python/phonenumbers/data/region_HK.py
	python/phonenumbers/data/region_HR.py
	python/phonenumbers/data/region_HU.py
	python/phonenumbers/data/region_IE.py
	python/phonenumbers/data/region_IL.py
	python/phonenumbers/data/region_IN.py
	python/phonenumbers/data/region_IS.py
	python/phonenumbers/data/region_IT.py
	python/phonenumbers/data/region_JO.py
	python/phonenumbers/data/region_JP.py
	python/phonenumbers/data/region_KE.py
	python/phonenumbers/data/region_KR.py
	python/phonenumbers/data/region_KW.py
	python/phonenumbers/data/region_LT.py
	python/phonenumbers/data/region_LU.py
	python/phonenumbers/data/region_LV.py
	python/phonenumbers/data/region_MA.py
	python/phonenumbers/data/region_MD.py
	python/phonenumbers/data/region_MK.py
	python/phonenumbers/data/region_MT.py
	python/phonenumbers/data/region_MX.py
	python/phonenumbers/data/region_MY.py
	python/phonenumbers/data/region_NG.py
	python/phonenumbers/data/region_NL.py
	python/phonenumbers/data/region_NZ.py
	python/phonenumbers/data/region_OM.py
	python/phonenumbers/data/region_PA.py
	python/phonenumbers/data/region_PE.py
	python/phonenumbers/data/region_PG.py
	python/phonenumbers/data/region_PK.py
	python/phonenumbers/data/region_PL.py
	python/phonenumbers/data/region_PT.py
	python/phonenumbers/data/region_PY.py
	python/phonenumbers/data/region_QA.py
	python/phonenumbers/data/region_RO.py
	python/phonenumbers/data/region_RS.py
	python/phonenumbers/data/region_SA.py
	python/phonenumbers/data/region_SE.py
	python/phonenumbers/data/region_SG.py
	python/phonenumbers/data/region_SI.py
	python/phonenumbers/data/region_SK.py
	python/phonenumbers/data/region_TH.py
	python/phonenumbers/data/region_TR.py
	python/phonenumbers/data/region_TW.py
	python/phonenumbers/data/region_US.py
	python/phonenumbers/data/region_ZA.py
	python/phonenumbers/geodata/__init__.py
	python/phonenumbers/phonemetadata.py
	python/phonenumbers/phonenumberutil.py
	python/tests/geocodertest.py
	python/tests/testgeodata/__init__.py

1 files changed, 1 insertions, 0 deletions

diff --git a/tools/python/buildmetadatafromxml.py b/tools/python/buildmetadatafromxml.py
index 74803dea..a9ef3d11 100755
--- a/tools/python/buildmetadatafromxml.py
+++ b/tools/python/buildmetadatafromxml.py
@@ -368,6 +368,7 @@ class XTerritory(UnicodeMixin):
                                                                self.o.national_prefix)
         self.o.main_country_for_code = get_true_attrib(xterritory, 'mainCountryForCode')
         self.o.leading_zero_possible = get_true_attrib(xterritory, 'leadingZeroPossible')
+        self.o.mobile_number_portable_region = get_true_attrib(xterritory, 'mobileNumberPortableRegion')
 
         # Retrieve the various PhoneNumberDesc elements.  The general_desc is
         # first and most important; it will be used to fill out missing fields in