Some updates to https://github.com/django/django/pull/2903