Merge branch 'master_MDL-67540' of https://github.com/golenkovm/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 03:20:55 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 03:20:55 +0000 (11:20 +0800)

Trivial merge