Merge branch 'MDL-65689-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2019 21:31:51 +0000 (23:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2019 21:31:51 +0000 (23:31 +0200)

Trivial merge