Merge branch 'MDL-62224_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:14 +0000 (17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:14 +0000 (17:38 +0200)

Trivial merge