Merge branch 'MDL-69381' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 03:28:09 +0000 (11:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 03:28:09 +0000 (11:28 +0800)

Trivial merge