Merge branch 'MDL-67712-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 11:28:05 +0000 (12:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 11:28:05 +0000 (12:28 +0100)

Trivial merge