Fixing bug with download name
Merge pull request #1915 from OCHA-DAP/download-name-fix

Pull req: Fixing bug with download name
Merge pull request #1916 from OCHA-DAP/dev

Dev into Stag