Merge branch 'MDL-66568-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jun 2020 15:57:17 +0000 (17:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jun 2020 15:57:17 +0000 (17:57 +0200)

Trivial merge