Merge branch 'MDL-37226-master' of git://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 21 Oct 2020 09:46:55 +0000 (17:46 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 21 Oct 2020 09:46:55 +0000 (17:46 +0800)

Trivial merge