Merge branch 'MDL-55340-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:05:21 +0000 (10:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:05:21 +0000 (10:05 +0800)

Trivial merge