Git merges in Moodle 3.11.8 by Eloy Lafuente (stronk7)

commit d13ed5575ce4a2b62090924f9f0d0788a946e836
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Jun 2022 14:38:59 +0800
Tag:    v3.11.8

Merge branch 'MDL-72324-311-fix' of https://github.com/junpataleta/moodle into MOODLE_311_STABLE