CLOSES #736 OMG CLOSES #736
Merge pull request #1118 from OCHA-DAP/marianne-sprint

CLOSES #736 OMG CLOSES #736