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

Trivial merge