Merge branch '2.8-maintenance' into master

diff --cc babel/dates.py
Simple merge

diff --cc babel/messages/catalog.py
Simple merge

diff --cc babel/messages/pofile.py
Simple merge

diff --cc babel/numbers.py
Simple merge

diff --cc babel/support.py
Simple merge

diff --cc babel/util.py
Simple merge

diff --cc scripts/import_cldr.py
Simple merge

diff --cc tests/messages/test_pofile.py
Simple merge

diff --cc tests/test_dates.py
Simple merge

diff --cc tests/test_numbers.py
Simple merge

diff --cc tests/test_support.py
Simple merge

diff --cc tests/test_util.py
Simple merge