Merge branch 'MDL-68977-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 07:36:44 +0000 (15:36 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 07:36:44 +0000 (15:36 +0800)

Trivial merge