Git merges in Moodle 3.11.2 by Víctor Déniz

commit e08da48fbde3d7de5fdb7c38b2a1576bc58c9c2c
Author: Víctor Déniz <victor@moodle.com>
Date:   Thu, 22 Jul 2021 02:28:54 +0800
Tag:    v3.11.2

Merge branch 'MDL-72108-311' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE