Changes in dev branch according to AIFDR/inasafe-doc#6 GFDRR -> World Bank-GFDRR