Merge branch 'MDL-68845-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 30 Sep 2020 03:45:06 +0000 (11:45 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 30 Sep 2020 03:45:06 +0000 (11:45 +0800)

Trivial merge