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

Trivial merge