Merge branch 'MDL-62341-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2018 22:03:18 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2018 22:03:18 +0000 (00:03 +0200)

Trivial merge