Merge branch 'MDL-68899-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:29:02 +0000 (10:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:29:02 +0000 (10:29 +0800)

Trivial merge