Merge branch 'MDL-69122-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 03:49:02 +0000 (11:49 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 03:49:02 +0000 (11:49 +0800)

Trivial merge