Merge branch 'MDL-67817-master' of https://github.com/dthies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 21:08:09 +0000 (22:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 21:08:09 +0000 (22:08 +0100)

Trivial merge