Merge branch 'MDL-47750' of https://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 5 May 2020 03:55:15 +0000 (11:55 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 5 May 2020 03:55:15 +0000 (11:55 +0800)

Trivial merge