Merge branch 'MDL-68514-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Apr 2020 17:23:16 +0000 (19:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Apr 2020 17:23:16 +0000 (19:23 +0200)

Trivial merge