Unlock Django requirement
Fixed a runtest issue
Merge branch 'feature/newdjango' into next