hqdjango5
Merge pull request #1551 from dimagi/5

hqdjango5