Git merges in Moodle 3.10.11 by Jun Pataleta

commit d0e8babdca986d7448694e2991a75cb9bf5c34e7
Author: Jun Pataleta <jun@moodle.com>
Date:   Mon, 04 Apr 2022 13:56:14 +0800
Tag:    v3.10.11

Merge branch 'MDL-70014_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE


commit e4457963f0538469c4e53bd8648c9b999a8b25a0
Author: Jun Pataleta <jun@moodle.com>
Date:   Mon, 04 Apr 2022 13:05:36 +0800
Tag:    v3.10.11

Merge branch 'MDL-74096-310' of https://github.com/ilyatregubov/moodle into MOODLE_310_STABLE