Merge branch 'MDL-67722-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 19:13:08 +0000 (20:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 19:13:08 +0000 (20:13 +0100)

Trivial merge