Merge branch '6.0' into 6.1

diff --cc requirements.txt
index 9815fa30a08e2f75ed4878e35db3384bb6b07f02,5844de66b91bce9b0c1d1cdfd82c045217abfc4f..751bdc7caba34890ad30ea4e27b597eae1c9f0f3
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -2,5 -2,6 +2,6 @@@ Markdown==3.4.
  mike==1.1.2
  mkdocs-git-revision-date-plugin==0.3.2
  mkdocs-macros-plugin==1.0.4 
 -mkdocs-material==9.2.8
 -mkdocs==1.5.2
 +mkdocs-material==9.4.2
 +mkdocs==1.5.3
+ setuptools==69.0.3