Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/fields/related.py

1 files changed, 1 insertions, 1 deletions

diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 5f17229753..3eac2167d4 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -1,7 +1,7 @@
 from functools import wraps
 
 from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
+from django.db.models.loading import get_apps, get_app_paths, get_app, get_models, get_model, register_models
 from django.db.models.query import Q
 from django.db.models.expressions import F
 from django.db.models.manager import Manager