Merge branch 'MDL-65547-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 8 May 2020 16:30:34 +0000 (00:30 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 8 May 2020 16:30:34 +0000 (00:30 +0800)

Trivial merge