Merge branch 'MDL-68918-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:47:24 +0000 (10:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:47:24 +0000 (10:47 +0800)

Trivial merge