Merge branch 'master-MDL-67211_v6' of https://github.com/golenkovm/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 04:47:59 +0000 (12:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 04:47:59 +0000 (12:47 +0800)

Trivial merge