Merge branch 'MDL-62974-master' of https://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2019 21:49:55 +0000 (23:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2019 21:49:55 +0000 (23:49 +0200)

Trivial merge