Git merges in Moodle 3.9.15 by Jake Dallimore

commit e5aaeed609d347cfadda20413c489343eeee14d1
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 29 Jun 2022 16:45:23 +0800
Tag:    v3.9.15

Merge branch 'MDL-74674-39' of https://github.com/alfonso-salces/moodle into MOODLE_39_STABLE


commit 635389b235799acd63540b87723be8606b402050
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 29 Jun 2022 13:41:31 +0800
Tag:    v3.9.15

Merge branch 'MDL-74864-39' of https://github.com/dpalou/moodle into MOODLE_39_STABLE