Merge branch 'MDL-68855-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 29 May 2020 03:48:46 +0000 (11:48 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 29 May 2020 03:48:46 +0000 (11:48 +0800)

Trivial merge