Merge branch 'MDL-68404-master' of git://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 30 Apr 2020 05:33:45 +0000 (13:33 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 30 Apr 2020 05:33:45 +0000 (13:33 +0800)

Trivial merge