Merge branch 'MDL-67383-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 01:43:34 +0000 (09:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 03:06:10 +0000 (11:06 +0800)

Trivial merge