Merge branch 'master_MDL-69190' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:30:43 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:30:43 +0000 (09:30 +0800)

Trivial merge