Git merges in Moodle 3.9.7 by Jake Dallimore

commit 276476233d679a8097f81768fbe13499eb5d2415
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 03 May 2021 13:25:51 +0800
Tag:    v3.9.7

Merge branch 'MDL-52724-39' of git://github.com/merrill-oakland/moodle into MOODLE_39_STABLE


commit c32142cf8074594d76edb2815597f66049bcd580
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 15 Apr 2021 14:43:28 +0800
Tag:    v3.9.7

Merge branch 'MDL-71338-39' of git://github.com/paulholden/moodle into MOODLE_39_STABLE


commit ea90581cb19ba14409fbb2f1dc681f7dd09d3369
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 15 Apr 2021 08:33:03 +0800
Tag:    v3.9.7

Merge branch 'MDL-71119-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE