Merge branch 'MDL-62277-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)

Trivial merge