Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 30 Jul 2020 03:42:53 +0000 (11:42 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 30 Jul 2020 03:42:53 +0000 (11:42 +0800)

Trivial merge