Merge branch 'MDL-60260' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:54:26 +0000 (07:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:54:26 +0000 (07:54 +0800)

Trivial merge