Merge branch 'MDL-68216-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 06:20:09 +0000 (14:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 06:20:09 +0000 (14:20 +0800)

Trivial merge