Merge branch 'MDL-68793-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 03:56:31 +0000 (11:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Jun 2020 03:56:31 +0000 (11:56 +0800)

Trivial merge