fix for old Django
Merge branch 'master' into release