Merge branch 'MDL-67364-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 11:05:33 +0000 (12:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 11:05:33 +0000 (12:05 +0100)

Trivial merge