Merge branch 'MDL-67846-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 25 Feb 2020 08:52:45 +0000 (16:52 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 25 Feb 2020 08:52:45 +0000 (16:52 +0800)

Trivial merge