Git merges in Moodle 3.9.10 by Jun Pataleta

commit e09160b6db4856c641889522174b85bc7667c34e
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 10 Sep 2021 23:09:22 +0800
Tag:    v3.9.10

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


commit 0391a4afc756a1b68e5cb9cab139dda0affcb4af
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 02 Sep 2021 09:52:20 +0800
Tag:    v3.9.10

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