Merge branch 'MDL-65884' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2020 19:13:29 +0000 (20:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2020 19:13:29 +0000 (20:13 +0100)

Trivial merge