Merge branch 'MDL-69151' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jul 2020 00:27:36 +0000 (08:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jul 2020 00:27:36 +0000 (08:27 +0800)

Trivial merge