Git merges in Moodle 3.9.15 by Jun Pataleta

commit 03b6b9358937be6ed51b1b60eb0117959114d8cb
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 30 Jun 2022 20:23:48 +0800
Tag:    v3.9.15

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


commit 730b405d68f121fee42d7ff96d01c4a9eefaa63e
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 14 Jun 2022 13:58:29 +0800
Tag:    v3.9.15

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