Merge branch 'MDL-62449-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:18:51 +0000 (18:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:18:51 +0000 (18:18 +0200)

Trivial merge