Merge branch 'MDL-62380-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 00:06:48 +0000 (02:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 00:06:48 +0000 (02:06 +0200)

Trivial merge