Merge branch 'MDL-67442' of https://github.com/jonof/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2020 23:04:05 +0000 (00:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2020 23:04:05 +0000 (00:04 +0100)

Trivial merge