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

Trivial merge