Merge branch 'MDL-60470' of https://github.com/brendanheywood/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Apr 2019 18:26:17 +0000 (20:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Apr 2019 18:26:17 +0000 (20:26 +0200)

Trivial merge