Merge branch 'MDL-67758-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Feb 2020 16:35:38 +0000 (17:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Feb 2020 16:35:38 +0000 (17:35 +0100)

Trivial merge