Merge branch 'MDL-68890-master' of https://github.com/DinhHien0307/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 11:53:29 +0000 (19:53 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 11:53:29 +0000 (19:53 +0800)

Trivial merge