Merge branch 'MDL-59510-310' of https://github.com/snake/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 7 Oct 2020 01:58:52 +0000 (09:58 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 7 Oct 2020 01:58:52 +0000 (09:58 +0800)

Trivial merge