Merge branch 'MDL-61839-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 21:52:08 +0000 (23:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 21:52:08 +0000 (23:52 +0200)

Trivial merge