Merge branch 'MDL-67700-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 May 2020 02:51:31 +0000 (10:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 May 2020 02:51:31 +0000 (10:51 +0800)

Trivial merge