Merge branch 'MDL-69902-310' of https://github.com/marinaglancy/moodle into MOODLE_31...
authorJake Dallimore <jake@moodle.com>
Wed, 21 Oct 2020 02:57:35 +0000 (10:57 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 21 Oct 2020 02:57:35 +0000 (10:57 +0800)

Trivial merge