Merge branch 'MDL-67024-master' of git://github.com/farhan6318/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 00:34:41 +0000 (08:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 00:34:41 +0000 (08:34 +0800)

Trivial merge