Merge branch 'MDL-68406-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 01:50:56 +0000 (09:50 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 01:50:56 +0000 (09:50 +0800)

Trivial merge