Merge remote-tracking branch 'origin/develop' into fix-worldbank-urls

Author: spjuhel

CHANGELOG.md

@@ -21,20 +21,14 @@ Code freeze date: YYYY-MM-DD
   World Bank Indicators API instead of downloading a ZIP/CSV file.
   Updated available year range from 1995–2014 to 1995–2020. [#1292](https://github.com/CLIMADA-project/climada_python/pull/1292)
 - Makes current `measure` module a legacy module, moving it to `_legacy_measure`, to retain compatibility with `CostBenefit` class and various tests. [#1274](https://github.com/CLIMADA-project/climada_python/pull/1274)
-- `climada.util.finance`: `world_bank_wealth_account` now fetches data via the
-  World Bank Indicators API instead of downloading a ZIP/CSV file.
-  Updated available year range from 1995–2014 to 1995–2020. [#1292](https://github.com/CLIMADA-project/climada_python/pull/1292)
 
 ### Fixed
 
 - Fixed asset count in impact logging message [#1195](https://github.com/CLIMADA-project/climada_python/pull/1195).
 - `Hazard.from_raster_xarray` now returns a sparse matrix instead of a sparse array [#1261](https://github.com/CLIMADA-project/climada_python/pull/1261).
 - `climada.util.finance`: Fixed broken `WORLD_BANK_INC_GRP` download URL
   (`databank.worldbank.org`) whose SSL certificate had expired. [#1292](https://github.com/CLIMADA-project/climada_python/pull/1292)
-=======
 - Fix TCTracks.from_FAST duplicate loading from year loop [#1269](github.com/CLIMADA-project/climada_python/pull/1269)
-- `climada.util.finance`: Fixed broken `WORLD_BANK_INC_GRP` download URL
-  (`databank.worldbank.org`) whose SSL certificate had expired. [#1292](https://github.com/CLIMADA-project/climada_python/pull/1292)
 
 ### Deprecated
 - `Impact.calc_freq_curve()` should not be given the parameter `return_per`. Use the parameter `return_periods` in `Impact.calc_freq_curve().interpolate()` instead.