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, 2 insertions, 3 deletions

diff --git a/tests/test_sqlite.py b/tests/test_sqlite.py
index c04ef97cd0..6bce452c79 100644
--- a/tests/test_sqlite.py
+++ b/tests/test_sqlite.py
@@ -22,9 +22,8 @@ DATABASES = {
 }
 
 SECRET_KEY = "django_tests_secret_key"
-# To speed up tests under SQLite we use the MD5 hasher as the default one. 
-# This should not be needed under other databases, as the relative speedup
-# is only marginal there.
+
+# Use a fast hasher to speed up tests.
 PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.MD5PasswordHasher',
 )