Merge upstream v2.8.5 into develop

# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt

requirements.txt

@@ -1,26 +1,26 @@
-Django>=2.2,<2.3
+Django>=3.0,<3.1
 django-allauth==0.41.0
 django-cacheops==4.2
 django-cors-headers==3.2.1
-django-debug-toolbar==2.1
+django-debug-toolbar==2.2
 django-filter==2.2.0
-django-mptt==0.9.1
+django-mptt==0.11.0
 django-pglocks==1.0.4
-django-prometheus==1.1.0
-django-rq==2.2.0
-django-tables2==2.2.1
+django-prometheus==2.0.0
+django-rq==2.3.2
+django-tables2==2.3.1
 django-taggit==1.2.0
 django-taggit-serializer==0.1.7
 django-timezone-field==4.0
-djangorestframework==3.10.3
-drf-yasg[validation]==1.17.0
+djangorestframework==3.11.0
+drf-yasg[validation]==1.17.1
 gunicorn==20.0.4
-Jinja2==2.10.3
+Jinja2==2.11.1
 Markdown==3.2.1
 netaddr==0.7.19
-Pillow==7.0.0
-psycopg2-binary==2.8.4
-pycryptodome==3.9.4
-PyYAML==5.3
-redis==3.3.11
-svgwrite==1.3.1
+Pillow==7.1.1
+psycopg2-binary==2.8.5
+pycryptodome==3.9.7
+PyYAML==5.3.1
+redis==3.4.1
+svgwrite==1.4