Merge branch 'MDL-60340_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 23:36:51 +0000 (00:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 23:36:51 +0000 (00:36 +0100)

Trivial merge