Git merges in Moodle 3.9.9 by Sara Arjona

commit 22e52ebb554dc0559ff58f24520734e1bc3f6670
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 13 Jul 2021 22:44:53 +0800
Tag:    v3.9.9

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