Merge branch 'MDL-66559-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2019 14:33:46 +0000 (16:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2019 14:33:46 +0000 (16:33 +0200)

Trivial merge