Merge branch 'MDL-68111-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 00:43:28 +0000 (08:43 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 00:43:28 +0000 (08:43 +0800)

Trivial merge