Merge branch 'MDL-63026_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 13:59:51 +0000 (15:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 13:59:51 +0000 (15:59 +0200)

Trivial merge