Merge branch 'MDL-69356' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 06:00:44 +0000 (14:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 06:00:44 +0000 (14:00 +0800)

Trivial merge