Merge branch 'MDL-68193_master' of git://github.com/mdjnelson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 21:22:25 +0000 (23:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 21:22:25 +0000 (23:22 +0200)

Trivial merge