Merge branch 'MDL-68568-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 21 May 2020 06:26:54 +0000 (14:26 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 21 May 2020 06:26:54 +0000 (14:26 +0800)

Trivial merge