Merge branch 'MDL-62853' of https://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 25 May 2020 08:11:55 +0000 (16:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 25 May 2020 08:11:55 +0000 (16:11 +0800)

Trivial merge