Merge branch 'MDL-68994-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2020 21:31:11 +0000 (23:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2020 21:31:11 +0000 (23:31 +0200)

Trivial merge