Merge comment change from upstream r620
Merge metadata changes from upstreadm r620
Generated Python files for metadata
Merge branch 'dev' into python3

Conflicts:
	python/phonenumbers/carrierdata/__init__.py
	python/phonenumbers/data/alt_format_31.py
	python/phonenumbers/data/alt_format_359.py
	python/phonenumbers/data/alt_format_372.py
	python/phonenumbers/data/alt_format_49.py
	python/phonenumbers/data/alt_format_62.py
	python/phonenumbers/data/alt_format_7.py
	python/phonenumbers/data/region_AR.py
	python/phonenumbers/data/region_BE.py
	python/phonenumbers/data/region_CR.py
	python/phonenumbers/data/region_FI.py
	python/phonenumbers/geodata/__init__.py