Merge branch 'MDL-68041-master-rev2' of https://github.com/nhoobin/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 08:27:48 +0000 (16:27 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 08:27:48 +0000 (16:27 +0800)

Trivial merge