more Django 1.7 port