Merge branch 'MDL-64429' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Mar 2020 17:49:36 +0000 (18:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Mar 2020 17:49:36 +0000 (18:49 +0100)

Trivial merge