Git merges in Moodle 3.9.12 by Shamim Rezaie

commit 6c70a26c4159f1f9f2ddc2865f1eeab06505677c
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 07 Jan 2022 14:46:42 +0800
Tag:    v3.9.12

Merge branch 'MDL-73272/3.9' of https://github.com/skodak/moodle into MOODLE_39_STABLE


commit 8e12159d85d6d96eb5517af254b30eb99d9638b4
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Mon, 20 Dec 2021 08:01:00 +0800
Tag:    v3.9.12

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