update djangolib#3308

domdinicola wants to merge 2 commits intoupdate-reqsunicef/etools:update-reqsfrom

djangolibunicef/etools:djangolibCopy head branch name to clipboard