Merge branch 'MDL-68892-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:44:26 +0000 (09:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:44:26 +0000 (09:44 +0800)

Trivial merge