Merge branch 'MDL-68636-master' of git://github.com/aanabit/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 18 May 2020 00:21:53 +0000 (08:21 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 18 May 2020 00:21:53 +0000 (08:21 +0800)

Trivial merge