Merge branch 'develop' into 3428-cache-invalidation

netbox/extras/management/commands/nbshell.py

@@ -5,6 +5,7 @@ import sys
 from django import get_version
 from django.apps import apps
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 
 APPS = ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'users', 'virtualization']
@@ -50,6 +51,9 @@ class Command(BaseCommand):
             except KeyError:
                 pass
 
+        # Additional objects to include
+        namespace['User'] = User
+
         # Load convenience commands
         namespace.update({
             'lsmodels': self._lsmodels,