Merge remote-tracking branch 'origin/master' into prepare-release-2.1

docs/conf.py

@@ -204,6 +204,6 @@ epub_exclude_files = ["search.html"]
 intersphinx_mapping = {
     "https://docs.python.org/": None,
     "https://docs.djangoproject.com/en/stable": "https://docs.djangoproject.com/en/stable/_objects",
-    "https://aleksis.edugit.io/AlekSIS-Core/docs": None,
-    "https://aleksis.edugit.io/AlekSIS-App-Chronos/docs": None,
+    "https://aleksis.edugit.io/official/AlekSIS-Core/docs/html": None,
+    "https://aleksis.edugit.io/official/AlekSIS-App-Chronos/docs/html": None,
 }