Merge branch 'MDL-65724-master-3' of git://github.com/peterRd/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2020 12:44:03 +0000 (13:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2020 12:44:03 +0000 (13:44 +0100)

Trivial merge