Merge branch 'MDL-62768' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2020 17:33:00 +0000 (18:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2020 17:33:00 +0000 (18:33 +0100)

Trivial merge