Merge branch 'MDL-68330-master-2' of git://github.com/mihailges/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Sun, 3 May 2020 23:15:03 +0000 (07:15 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Sun, 3 May 2020 23:15:03 +0000 (07:15 +0800)

Trivial merge