Merge branch 'MDL-68528-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 May 2020 03:46:39 +0000 (11:46 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 May 2020 03:46:39 +0000 (11:46 +0800)

Trivial merge