Prepare for Django 1.11

Thom Wiggersrequested to merge
test_django11 into master

This tests our code under Django 1.11, which is coming out soon™.

It also fixes a Django 1.11-breaking migration.

Merge request reports