Merge branch 'MDL-62989-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2018 15:51:20 +0000 (17:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2018 15:51:20 +0000 (17:51 +0200)

Trivial merge