Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
#	requirements.txt
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html

setup.cfg

@@ -53,12 +53,13 @@ install_requires =
 	tornado>=6.3,<6.5
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<5.2.0
+	lxml>=4.9.1,<5.2.0
 	flask-wtf>=0.14.2,<1.3.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
 	Flask-Limiter>=2.3.0,<3.6.0
 	regex>=2022.3.2,<2024.2.25
+	bleach>=6.0.0,<6.2.0
 	python-magic>=0.4.27,<0.5.0