Merge branch 'MDL-67914-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 21:41:38 +0000 (23:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 21:41:38 +0000 (23:41 +0200)

Trivial merge