Merge branch 'MDL-67131-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 22:30:41 +0000 (23:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 22:30:41 +0000 (23:30 +0100)

Trivial merge