Merge branch 'MDL-67577-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2020 15:15:21 +0000 (16:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2020 15:15:21 +0000 (16:15 +0100)

Trivial merge