Merge branch 'MDL-63427-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 11:21:11 +0000 (13:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 11:21:11 +0000 (13:21 +0200)

Trivial merge