Git merges in Moodle 3.10.6 by Eloy Lafuente (stronk7)

commit 2ae51fd4de4459d82a1a46c0e407563b233973da
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Jul 2021 06:35:18 +0800
Tag:    v3.10.6

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


commit 99d77f27c5abca5dfd8b21c717420d6848a44513
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Jul 2021 20:00:08 +0800
Tag:    v3.10.6

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