Merge branch 'MDL-69031-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 01:38:46 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 01:38:46 +0000 (09:38 +0800)

Trivial merge