Merge branch 'MDL-68225-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 31 Mar 2020 07:16:37 +0000 (15:16 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 31 Mar 2020 07:16:37 +0000 (15:16 +0800)

Trivial merge