Fix readthedocs build
!1335 (merged) should also have been applied to the readthedocs pipeline. This fixes that, documents it, and applies !1349 (merged).
I suggest to just merge this and see if the readthedocs build now succeeds. Currently it's failing on applying the old patch.