Merge branch 'MDL-68454-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 4 May 2020 04:18:54 +0000 (12:18 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 4 May 2020 04:18:54 +0000 (12:18 +0800)

Trivial merge