Merge branch 'MDL-67672-master' of git://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 22:16:51 +0000 (00:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 22:16:51 +0000 (00:16 +0200)

Trivial merge