Conflicts: django/db/backends/oracle/base.py django/db/backends/sqlite3/base.py django/db/models/base.py Backport of 365c3e8b from master.
365c3e8b