Git merges in Moodle 3.10.6 by Sara Arjona

commit 426dbce03c4c973401601362f1a0a817ae274dcf
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 13 Jul 2021 22:44:46 +0800
Tag:    v3.10.6

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