Un-renaming intermediate models to work around Django bug:

https://code.djangoproject.com/ticket/22931
3 files changed