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

commit f1b64fb7421379589b24886f535c478a334d909a
Author: Víctor Déniz <victor@moodle.com>
Date:   Thu, 22 Jul 2021 02:29:59 +0800
Tag:    v3.10.6

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