Merge branch 'MDL-68846' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 May 2020 23:35:10 +0000 (07:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 May 2020 23:35:10 +0000 (07:35 +0800)

Trivial merge