Merge branch 'MDL-67990' of https://github.com/OdyX/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 00:56:10 +0000 (08:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 00:56:10 +0000 (08:56 +0800)

Trivial merge