Merge branch 'MDL-68502-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 May 2020 07:59:04 +0000 (15:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 May 2020 07:59:04 +0000 (15:59 +0800)

Trivial merge