Merge branch 'MDL-64494-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Mar 2020 16:59:09 +0000 (18:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Mar 2020 16:59:09 +0000 (18:59 +0200)

Trivial merge