Merge branch 'MDL-68108-master' of git://github.com/crazyserver/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Mar 2020 15:01:08 +0000 (23:01 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Mar 2020 15:01:08 +0000 (23:01 +0800)

Trivial merge