Merge branch 'MDL-67915-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 Apr 2020 15:11:38 +0000 (23:11 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Apr 2020 15:11:38 +0000 (23:11 +0800)

Trivial merge