add Django 1.7 migration for #718
Merge branch 'master' of github.com:torchbox/wagtail