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

Trivial merge