django3!
Merge pull request #1492 from dimagi/cz

django3!