Merge branch 'master-MDL-69307_v4' of https://github.com/golenkovm/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Aug 2020 06:48:36 +0000 (14:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Aug 2020 06:48:36 +0000 (14:48 +0800)

Trivial merge