closes #1456
Merge remote-tracking branch 'origin/dev' into dev-dan-36
#1495
Merge remote-tracking branch 'origin/dev' into dev-dan-36
closes #1490
Merge pull request #1535 from OCHA-DAP/dev-dan-36

closes #1456