Merge branch 'MDL-62419-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 14:56:37 +0000 (16:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 14:56:37 +0000 (16:56 +0200)

Trivial merge