Merge branch 'MDL-58931-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Jul 2020 20:47:16 +0000 (22:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Jul 2020 20:56:30 +0000 (22:56 +0200)

Trivial merge