=== modified file 'debian/changelog'
--- debian/changelog	2016-07-20 01:09:31 +0000
+++ debian/changelog	2016-07-21 14:31:41 +0000
@@ -1,3 +1,12 @@
+python-django (1:1.9.7-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian (LP: #1605278). Remaining change:
+    - debian/patches/pymysql-replacement.patch
+      debian/control:
+      Allow python-pymysql to be used instead of python-mysqldb
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 21 Jul 2016 10:28:28 -0400
+
 python-django (1:1.9.7-2) unstable; urgency=medium
 
   * Re-upload 1.9.7 to unstable with epoch.

=== modified file 'debian/control'
--- debian/control	2016-07-20 01:09:31 +0000
+++ debian/control	2016-07-20 03:12:32 +0000
@@ -60,7 +60,7 @@
  python-django-doc,
  python-flup,
  python-memcache,
- python-mysqldb,
+ python-pymysql | python-mysqldb,
  python-pil,
  python-psycopg2,
  python-sqlite,
@@ -107,7 +107,7 @@
  python3-bcrypt,
  python3-flup,
  python3-memcache,
- python3-mysqldb,
+ python3-pymysql | python3-mysqldb,
  python3-pil,
  python3-psycopg2,
  python3-sqlite,

=== added file 'debian/patches/pymysql-replacement.patch'
--- debian/patches/pymysql-replacement.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/pymysql-replacement.patch	2016-07-21 14:27:20 +0000
@@ -0,0 +1,59 @@
+From: Corey Bryant <corey.bryant@canonical.com>
+Date: Mon, 24 Aug 2015 11:01:47 -0400
+Subject: Use pymysql as a drop-in replacement for MySQLdb.
+
+Bug: https://code.djangoproject.com/ticket/22391
+Bug-Debian: https://bugs.debian.org/831836
+---
+ django/contrib/gis/db/backends/mysql/introspection.py | 6 ++++++
+ django/db/backends/mysql/base.py                      | 6 ++++++
+ django/db/backends/mysql/schema.py                    | 5 +++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/django/contrib/gis/db/backends/mysql/introspection.py b/django/contrib/gis/db/backends/mysql/introspection.py
+index 364cdee..9b334e8 100644
+--- a/django/contrib/gis/db/backends/mysql/introspection.py
++++ b/django/contrib/gis/db/backends/mysql/introspection.py
+@@ -1,3 +1,9 @@
++try:
++    import pymysql
++    pymysql.install_as_MySQLdb()
++except ImportError:
++    pass
++
+ from MySQLdb.constants import FIELD_TYPE
+ 
+ from django.contrib.gis.gdal import OGRGeomType
+diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
+index 03f3857..92a696d 100644
+--- a/django/db/backends/mysql/base.py
++++ b/django/db/backends/mysql/base.py
+@@ -22,6 +22,12 @@ from django.utils.functional import cached_property
+ from django.utils.safestring import SafeBytes, SafeText
+ 
+ try:
++    import pymysql
++    pymysql.install_as_MySQLdb()
++except ImportError:
++    pass
++
++try:
+     import MySQLdb as Database
+ except ImportError as e:
+     from django.core.exceptions import ImproperlyConfigured
+diff --git a/django/db/backends/mysql/schema.py b/django/db/backends/mysql/schema.py
+index ef4ccf5..c0f608f 100644
+--- a/django/db/backends/mysql/schema.py
++++ b/django/db/backends/mysql/schema.py
+@@ -1,6 +1,11 @@
+ from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+ from django.db.models import NOT_PROVIDED
+ 
++try:
++    import pymysql
++    pymysql.install_as_MySQLdb()
++except ImportError:
++    pass
+ 
+ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-07-20 01:09:31 +0000
+++ debian/patches/series	2016-07-21 14:26:58 +0000
@@ -1,3 +1,4 @@
 02_disable-sources-in-sphinxdoc.diff
 06_use_debian_geoip_database_as_default.diff
 fix-25761-add-traceback-attribute.patch
+pymysql-replacement.patch