Merge branch 'MDL-68677-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:58:41 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:58:41 +0000 (01:58 +0200)

Trivial merge