Merge branch 'MDL-64693-master' of https://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2019 21:46:24 +0000 (23:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2019 21:46:24 +0000 (23:46 +0200)

Trivial merge