Merge branch 'MDL-68584-master' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 Jul 2020 08:42:19 +0000 (16:42 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 Jul 2020 08:42:19 +0000 (16:42 +0800)

Trivial merge