Merge branch 'MDL-67943-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Aug 2020 02:35:08 +0000 (10:35 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Aug 2020 22:47:48 +0000 (00:47 +0200)

Trivial merge