Merge branch 'MDL-67827-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Mar 2020 19:36:09 +0000 (20:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Mar 2020 19:36:09 +0000 (20:36 +0100)

Trivial merge