move import to top of the module
update django test versions
Merge branch 'master' into python3