Merge branch 'MDL-68614-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2020 21:51:04 +0000 (23:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2020 22:09:44 +0000 (00:09 +0200)

Trivial merge