Merge branch 'MDL-68406-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 01:51:51 +0000 (09:51 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 01:51:51 +0000 (09:51 +0800)

Trivial merge