Merge branch 'MDL-69026-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 12 Jun 2020 03:58:59 +0000 (11:58 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 12 Jun 2020 03:58:59 +0000 (11:58 +0800)

Trivial merge