Merge branch 'MDL-68508-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 22 May 2020 03:06:16 +0000 (11:06 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 22 May 2020 03:06:16 +0000 (11:06 +0800)

Trivial merge