Merge branch 'MDL-57682-310-fix' of git://github.com/andrewnicols/moodle into MOODLE_...
authorJun Pataleta <jun@moodle.com>
Wed, 9 Sep 2020 08:06:02 +0000 (16:06 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 9 Sep 2020 08:06:02 +0000 (16:06 +0800)

Trivial merge