Merge branch 'MDL-69716-310' of git://github.com/aanabit/moodle into MOODLE_310_STABLE
authorJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 04:40:06 +0000 (12:40 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 04:40:06 +0000 (12:40 +0800)

Trivial merge