Merge branch 'MDL-42012-310-alt' of git://github.com/andrewnicols/moodle into MOODLE_...
authorJun Pataleta <jun@moodle.com>
Tue, 15 Sep 2020 03:52:56 +0000 (11:52 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 Sep 2020 03:52:56 +0000 (11:52 +0800)

Trivial merge