Git merges in Moodle 3.10.4 by Jake Dallimore

commit 79368aaa6afa9150ba40f7d4c0426fd0736fcfba
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 03 May 2021 13:25:36 +0800
Tag:    v3.10.4

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


commit 6958a078a6bbf9aa01884426e9bcc8e0809b2990
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 15 Apr 2021 14:42:44 +0800
Tag:    v3.10.4

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


commit 5566bfe436a86d8186f82109b0d84e33e84f1560
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 15 Apr 2021 08:32:29 +0800
Tag:    v3.10.4

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