Merge branch 'MDL-69021-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 23 Jun 2020 03:31:08 +0000 (11:31 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 23 Jun 2020 03:31:08 +0000 (11:31 +0800)

Trivial merge