Merge branch 'MDL-69271' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:34:18 +0000 (07:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:34:18 +0000 (07:34 +0800)

Trivial merge