Merge branch 'MDL-68929-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 8 Jun 2020 03:11:16 +0000 (11:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 8 Jun 2020 03:11:16 +0000 (11:11 +0800)

Trivial merge