Carried over changes from humanitarianresponse_dev.make
Merge branch 'master' of https://github.com/humanitarianresponse/hr_platform