Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/cache/closeable_cache.py b/tests/cache/closeable_cache.py
new file mode 100644
index 0000000000..83073850b7
--- /dev/null
+++ b/tests/cache/closeable_cache.py
@@ -0,0 +1,11 @@
+from django.core.cache.backends.locmem import LocMemCache
+
+
+class CloseHookMixin(object):
+    closed = False
+
+    def close(self, **kwargs):
+        self.closed = True
+
+class CacheClass(CloseHookMixin, LocMemCache):
+    pass