Merge branch 'MDL-68405-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 14 Apr 2020 08:09:42 +0000 (16:09 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 14 Apr 2020 08:09:42 +0000 (16:09 +0800)

Trivial merge