Merge branch 'MDL-68144-master' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 31 Mar 2020 05:59:27 +0000 (13:59 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 31 Mar 2020 05:59:27 +0000 (13:59 +0800)

Trivial merge