Merge branch 'MDL-66607-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Mar 2020 09:08:22 +0000 (10:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Mar 2020 09:08:22 +0000 (10:08 +0100)

Trivial merge