Merge branch 'MDL-69047-master' of git://github.com/aanabit/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 22 Jun 2020 04:41:06 +0000 (12:41 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 22 Jun 2020 04:41:06 +0000 (12:41 +0800)

Trivial merge