Merge branch 'MDL-54956-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 1 Oct 2020 03:17:44 +0000 (11:17 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 1 Oct 2020 03:17:44 +0000 (11:17 +0800)

Trivial merge