Merge branch 'MDL-69002-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 11 Jun 2020 03:08:14 +0000 (11:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 11 Jun 2020 03:08:14 +0000 (11:08 +0800)

Trivial merge