Merge branch 'MDL-68462-master' of git://github.com/lameze/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 6 May 2020 02:28:39 +0000 (10:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 03:06:11 +0000 (11:06 +0800)

Trivial merge