Upstream changes in django core

[g-k]

Per discussion in https://code.djangoproject.com/ticket/15727 this is blocked on #36

[h1771t]

any plan for this to actually be done? thanks.

[h1771t]

#36 is being picked up again.

[robhudson]

Work is slowly happening in this PR:
django/django#18215